diff options
| author | Tim Smith <tsmith@chef.io> | 2020-01-27 15:19:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 15:19:40 -0800 |
| commit | 62cea59b27511f00a793de467b3f07b041b30581 (patch) | |
| tree | b6b04bd4fc7947ee496a8c93cb7376229039db54 | |
| parent | 18de236bf4f48ce997ac53ddff16f3df1c8b605d (diff) | |
| parent | 6305bc79730d0d53b0eff377ad30a4a6df40d30c (diff) | |
| download | chef-62cea59b27511f00a793de467b3f07b041b30581.tar.gz | |
Merge pull request #9290 from chef/site-cookbooks-config
Remove the sites-cookbooks dir from the cookbook_path default config
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index b2dff9a764..a0fc8d5bd2 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -272,15 +272,8 @@ module ChefConfig # Location of cookbooks on disk. String or array of strings. # Defaults to <chef_repo_path>/cookbooks. If chef_repo_path - # is not specified, this is set to [/var/chef/cookbooks, /var/chef/site-cookbooks]). - default(:cookbook_path) do - if configuration[:chef_repo_path] - derive_path_from_chef_repo_path("cookbooks") - else - Array(derive_path_from_chef_repo_path("cookbooks")).flatten + - Array(derive_path_from_chef_repo_path("site-cookbooks")).flatten - end - end + # is not specified, this is set to /var/chef/cookbooks. + default(:cookbook_path) { derive_path_from_chef_repo_path("cookbooks") } # Location of data bags on disk. String or array of strings. # Defaults to <chef_repo_path>/data_bags. |