summaryrefslogtreecommitdiff
path: root/lib/chef/application.rb
diff options
context:
space:
mode:
authorLuke Amdor <luke.amdor@gmail.com>2014-04-16 15:25:40 -0700
committerBryan McLellan <btm@getchef.com>2014-06-05 12:19:41 -0700
commitb88db29b5ab1e388cd8f03f2aa8ce2c3018ff1a5 (patch)
tree00cb2d4064e1e648a9c09ac4eb53e2d283073001 /lib/chef/application.rb
parent5c6492da1466048eb259a523fbf38345c1018567 (diff)
downloadchef-b88db29b5ab1e388cd8f03f2aa8ce2c3018ff1a5.tar.gz
making the chef-zero host configurable for knife and chef-client
Diffstat (limited to 'lib/chef/application.rb')
-rw-r--r--lib/chef/application.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index bf19a53c8b..ca610480d0 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -198,9 +198,9 @@ class Chef::Application
server_options = {}
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 #{chef_fs.fs_description}")
+ server_options[:port] = Chef::Config.chef_zero.port
+ Chef::Log.info("Starting chef-zero on host #{Chef::Config.chef_zero.host}, 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