Merge branch 'CHEF-2860'

2 files changed, 6 insertions, 0 deletions

diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb
index 3539ffe3a8..7b71b017d5 100644
--- a/chef/lib/chef/config.rb
+++ b/chef/lib/chef/config.rb
@@ -197,6 +197,8 @@ class Chef
     # 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
index cdff869480..0d42ed6323 100644
--- a/chef/spec/unit/config_spec.rb
+++ b/chef/spec/unit/config_spec.rb
@@ -159,5 +159,9 @@ describe Chef::Config do
     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