From d3bd7e18b7378a19fa402d9b34788b9dc1e466bf Mon Sep 17 00:00:00 2001 From: John Keiser Date: Mon, 26 May 2014 22:19:45 -0700 Subject: Explicitly add org defaults to pedant test so that it passes, but don't feed the defaults to the user by default. --- lib/chef/application.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/chef/application.rb') diff --git a/lib/chef/application.rb b/lib/chef/application.rb index cc80cef980..12e1546627 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -185,12 +185,13 @@ class Chef::Application chef_fs = Chef::ChefFS::Config.new.local_fs chef_fs.write_pretty_json = true + data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs) server_options = {} - server_options[:data_store] = Chef::ChefFS::ChefFSDataStore.new(chef_fs) + server_options[:data_store] = data_store server_options[:log_level] = Chef::Log.level server_options[:port] = Chef::Config.chef_zero.port server_options[:host] = Chef::Config.chef_zero.host - Chef::Log.info("Starting chef-zero on port #{Chef::Config.chef_zero.port} with repository at #{server_options[:data_store].chef_fs.fs_description}") + Chef::Log.info("Starting chef-zero on port #{Chef::Config.chef_zero.port} with repository at #{chef_fs.fs_description}") @chef_zero_server = ChefZero::Server.new(server_options) @chef_zero_server.start_background Chef::Config.chef_server_url = @chef_zero_server.url -- cgit v1.2.1