diff options
| author | Tim Smith <tsmith@chef.io> | 2020-07-06 10:45:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 10:45:46 -0700 |
| commit | d390ab8daca1ad0a28754971fcb3b3bd0262a66f (patch) | |
| tree | fd20dc41f13f6b506226069ce3f69e53eff81308 | |
| parent | df4a175665f9607e49d164bb926f8e5f953ba2d7 (diff) | |
| parent | 75603f7b8243a4d3d4a76c1700717f1d945c6374 (diff) | |
| download | chef-d390ab8daca1ad0a28754971fcb3b3bd0262a66f.tar.gz | |
Merge pull request #9992 from cinc-project/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 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! |