diff options
| author | John Keiser <jkeiser@opscode.com> | 2013-09-14 10:19:30 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2013-10-02 11:57:50 -0700 |
| commit | c74c6101d29f5866b1894277114bc66f8ab3b007 (patch) | |
| tree | 4de8b716dca3ce5806501b2aa344fbb31891e640 /lib/chef/application.rb | |
| parent | 2735cf36f6b810a79371aa0e4735634001e7ddf9 (diff) | |
| download | chef-c74c6101d29f5866b1894277114bc66f8ab3b007.tar.gz | |
Rename start_chef_zero -> chef_zero.enabled
Diffstat (limited to 'lib/chef/application.rb')
| -rw-r--r-- | lib/chef/application.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index eb0488db1f..167ea5dfec 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -173,7 +173,7 @@ class Chef::Application end def self.setup_server_connectivity - if Chef::Config.start_chef_zero + if Chef::Config.chef_zero.enabled destroy_server_connectivity require 'chef_zero/server' @@ -182,8 +182,8 @@ class Chef::Application server_options = {} server_options[:data_store] = Chef::ChefFS::ChefFSDataStore.new(Chef::ChefFS::Config.new.local_fs) server_options[:log_level] = Chef::Log.level - server_options[:port] = Chef::Config.chef_zero_port - Chef::Log.info("Starting chef-zero on port #{Chef::Config.chef_zero_port} with repository at #{server_options[:data_store]}") + server_options[:port] = Chef::Config.chef_zero.port + Chef::Log.info("Starting chef-zero on port #{Chef::Config.chef_zero.port} with repository at #{server_options[:data_store]}") @chef_zero_server = ChefZero::Server.new(server_options) @chef_zero_server.start_background Chef::Config.chef_server_url = @chef_zero_server.url |