summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2014-10-21 10:54:11 -0700
committerSerdar Sutay <serdar@opscode.com>2014-10-21 10:54:11 -0700
commitfcae30b2026adf4a87346dc056c2b21e19fb9287 (patch)
tree27cf5db2482940788df77f0aa055ef4ce3f8571e
parent8c1be56ff907abef6e8cc6f30734112a2d38db69 (diff)
parent41ce3665053ff9112a49db92f4e9225346702e83 (diff)
downloadchef-fcae30b2026adf4a87346dc056c2b21e19fb9287.tar.gz
Merge pull request #2126 from trvrnrth/fix-ssh-errorhandler-name-lookup
Remove node_name lookup in knife ssh error handler
-rw-r--r--lib/chef/knife/ssh.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index accca39aa2..de4c60d998 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -106,13 +106,6 @@ class Chef
def session
config[:on_error] ||= :skip
ssh_error_handler = Proc.new do |server|
- if config[:manual]
- node_name = server.host
- else
- @action_nodes.each do |n|
- node_name = n if format_for_display(n)[config[:attribute]] == server.host
- end
- end
case config[:on_error]
when :skip
ui.warn "Failed to connect to #{server.host} -- #{$!.class.name}: #{$!.message}"