diff options
| author | Tim Smith <tsmith@chef.io> | 2020-07-06 14:48:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 14:48:57 -0700 |
| commit | 054a5d485d8308b6e48b3eac7e56b964620a71b4 (patch) | |
| tree | ff85f43e82ef0553566e6df32b7bf45e8efbf3b0 | |
| parent | b3cfb9b508a7f4b651fd9a2662466b62fe58b2af (diff) | |
| parent | c623667b9df45a37f66a057d8bf072707fdebd5b (diff) | |
| download | chef-054a5d485d8308b6e48b3eac7e56b964620a71b4.tar.gz | |
Merge pull request #10116 from ramereth/chef-15-knife-bootstrap-enforce_license-opt
Implement ENFORCE_LICENSE dist constant for knife bootstrap
| -rw-r--r-- | chef-config/lib/chef-config/dist.rb | 3 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 2 |
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 5e7ef5a28d..1a107db8fc 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -555,7 +555,7 @@ class Chef end def run - check_license + check_license if ChefConfig::Dist::ENFORCE_LICENSE plugin_setup! validate_name_args! |