summaryrefslogtreecommitdiff
path: root/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-01-12 16:50:03 -0800
committerJohn Keiser <john@johnkeiser.com>2016-01-13 13:40:13 -0800
commitb750db5517c5c88e52f7bad9e75b9f7ababe9e42 (patch)
tree06d589ad33204fd272eb444e8c3a3fbc99570cdf /lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
parent1edd3dba71b4531bb1a570dd7e387620e8ee61de (diff)
downloadchef-b750db5517c5c88e52f7bad9e75b9f7ababe9e42.tar.gz
Split versioned and unversioned cookbooks into separate classes
Diffstat (limited to 'lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb')
-rw-r--r--lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
index 1ac03166c2..4524dda608 100644
--- a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
@@ -21,6 +21,7 @@ require 'chef/chef_fs/file_system/chef_server/acls_dir'
require 'chef/chef_fs/file_system/base_fs_dir'
require 'chef/chef_fs/file_system/chef_server/rest_list_dir'
require 'chef/chef_fs/file_system/chef_server/cookbooks_dir'
+require 'chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir'
require 'chef/chef_fs/file_system/chef_server/data_bags_dir'
require 'chef/chef_fs/file_system/chef_server/nodes_dir'
require 'chef/chef_fs/file_system/chef_server/org_entry'
@@ -141,7 +142,7 @@ class Chef
@children ||= begin
result = [
# /cookbooks
- CookbooksDir.new("cookbooks", self),
+ versioned_cookbooks ? VersionedCookbooksDir.new("cookbooks", self) : CookbooksDir.new("cookbooks", self),
# /data_bags
DataBagsDir.new("data_bags", self, "data"),
# /environments