diff options
| author | Tyler Ball <tball@chef.io> | 2019-05-16 07:25:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 07:25:00 -0600 |
| commit | 0c1b7dac3166bf2687facc8414c315cbe679cd63 (patch) | |
| tree | 9e82e2fe0c8791dadc32d2d9b991438ca601d314 | |
| parent | 8b730aefbc7e7ef6716de8e634fc5d5925a6944e (diff) | |
| parent | f68a248a89a23a5ab906e7add40a83152cc6e1f5 (diff) | |
| download | chef-0c1b7dac3166bf2687facc8414c315cbe679cd63.tar.gz | |
Merge pull request #8554 from chef/chef_apply_license
Add license CLI options to chef-apply command
| -rw-r--r-- | lib/chef/application/apply.rb | 2 | ||||
| -rw-r--r-- | lib/chef/application/solo.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb index 40544f753a..275fe19f93 100644 --- a/lib/chef/application/apply.rb +++ b/lib/chef/application/apply.rb @@ -27,8 +27,10 @@ require "tempfile" require_relative "../providers" require_relative "../resources" require_relative "../dist" +require "license_acceptance/cli_flags/mixlib_cli" class Chef::Application::Apply < Chef::Application + include LicenseAcceptance::CLIFlags::MixlibCLI banner "Usage: chef-apply [RECIPE_FILE | -e RECIPE_TEXT | -s] [OPTIONS]" diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index 542088fefe..5cfcce9553 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -30,10 +30,12 @@ require "pathname" require "chef-config/mixin/dot_d" require "mixlib/archive" require_relative "../dist" +require "license_acceptance/cli_flags/mixlib_cli" class Chef::Application::Solo < Chef::Application include Chef::Mixin::ShellOut include ChefConfig::Mixin::DotD + include LicenseAcceptance::CLIFlags::MixlibCLI option :config_file, short: "-c CONFIG", |