summaryrefslogtreecommitdiff
path: root/lib/chef/knife.rb
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-06-30 11:16:30 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-07-07 10:04:59 -0700
commitb658f99957b24bfdf72fb340336d0348fdaf70f5 (patch)
tree0d37b71e4163fed13fc74ff798f4ba6be5a5528f /lib/chef/knife.rb
parent56cafd894a96d2e771147663b78126d7fe559d25 (diff)
downloadchef-b658f99957b24bfdf72fb340336d0348fdaf70f5.tar.gz
Move local-mode server connectivity code to Chef::LocalMode
Diffstat (limited to 'lib/chef/knife.rb')
-rw-r--r--lib/chef/knife.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index f8622975e8..4874f28cd6 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -25,6 +25,7 @@ require 'chef/mixin/convert_to_class_name'
require 'chef/mixin/path_sanity'
require 'chef/knife/core/subcommand_loader'
require 'chef/knife/core/ui'
+require 'chef/local_mode'
require 'chef/rest'
require 'pp'
@@ -488,11 +489,11 @@ class Chef
ui.error "You need to add a #run method to your knife command before you can use it"
end
enforce_path_sanity
- Chef::Application.setup_server_connectivity
+ Chef::LocalMode.setup_server_connectivity
begin
run
ensure
- Chef::Application.destroy_server_connectivity
+ Chef::LocalMode.destroy_server_connectivity
end
rescue Exception => e
raise if raise_exception || Chef::Config[:verbosity] == 2
@@ -625,4 +626,3 @@ class Chef
end
end
-