Merge branch 'CHEF-2860'

guillermo · Feb 9, 2012 · 293c69c · 293c69c
2 parents 7bcf3c0 + 157d39c
commit 293c69c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb
@@ -197,6 +197,8 @@ def self.platform_specific_path(path)
     # Where should chef-solo look for role files?
     role_path platform_specific_path("/var/chef/roles")
 
+    data_bag_path platform_specific_path("/var/chef/data_bags")
+
     # Where should chef-solo download recipes from?
     recipe_url nil
 

diff --git a/chef/spec/unit/config_spec.rb b/chef/spec/unit/config_spec.rb
@@ -159,5 +159,9 @@
     it "Chef::Config[:ssl_ca_file] defaults to nil" do
       Chef::Config[:ssl_ca_file].should be_nil
     end
+
+    it "Chef::Config[:data_bag_path] defaults to /var/chef/data_bags" do
+      Chef::Config[:data_bag_path].should == "/var/chef/data_bags"
+    end
   end
 end