diff options
Diffstat (limited to 'lib/chef/application')
-rw-r--r-- | lib/chef/application/apply.rb | 3 | ||||
-rw-r--r-- | lib/chef/application/solo.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb index 34f0973b40..715e0152d2 100644 --- a/lib/chef/application/apply.rb +++ b/lib/chef/application/apply.rb @@ -214,8 +214,9 @@ class Chef::Application::Apply < Chef::Application end # Get this party started - def run + def run(enforce_license = false) reconfigure + check_license_acceptance if enforce_license run_application end diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index 04cc9265ff..4a3957146e 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -217,10 +217,11 @@ class Chef::Application::Solo < Chef::Application attr_reader :chef_client_json # Get this party started - def run + def run(enforce_license = false) setup_signal_handlers setup_application reconfigure + check_license_acceptance if enforce_license for_ezra if Chef::Config[:ez] if !Chef::Config[:solo_legacy_mode] Chef::Application::Client.new.run |