diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-05-26 22:19:45 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-05-27 07:23:42 -0700 |
| commit | d3bd7e18b7378a19fa402d9b34788b9dc1e466bf (patch) | |
| tree | 3775bd0519d27974f136eab5c6ba4a7136113cdc /lib/chef/application.rb | |
| parent | c60605c65954176c9a3daa0bf6bd27e56a5c9880 (diff) | |
| download | chef-d3bd7e18b7378a19fa402d9b34788b9dc1e466bf.tar.gz | |
Explicitly add org defaults to pedant test
so that it passes, but don't feed the defaults to
the user by default.
Diffstat (limited to 'lib/chef/application.rb')
| -rw-r--r-- | lib/chef/application.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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 |