summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chef-config/lib/chef-config/dist.rb3
-rw-r--r--lib/chef/knife/bootstrap.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/chef-config/lib/chef-config/dist.rb b/chef-config/lib/chef-config/dist.rb
index e75b26730f..e69d39813d 100644
--- a/chef-config/lib/chef-config/dist.rb
+++ b/chef-config/lib/chef-config/dist.rb
@@ -19,5 +19,8 @@ module ChefConfig
# The legacy conf folder: C:/opscode/chef. Specifically the "opscode" part
# DIR_SUFFIX is appended to it in code where relevant
LEGACY_CONF_DIR = "opscode".freeze
+
+ # Enable forcing Chef EULA
+ ENFORCE_LICENSE = true
end
end
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index 48ff008d22..2232448044 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -538,7 +538,7 @@ class Chef
end
def run
- check_license
+ check_license if ChefConfig::Dist::ENFORCE_LICENSE
plugin_setup!
validate_name_args!