summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor North <trevor@freedisc.co.uk>2014-09-29 14:47:39 +0100
committerTrevor North <trevor@freedisc.co.uk>2014-09-29 14:47:39 +0100
commit41ce3665053ff9112a49db92f4e9225346702e83 (patch)
treeabf2f908a799564d4a3ce9295999478c96529787
parent5a88d0ef5b64280150f89332544e55144605eeb1 (diff)
downloadchef-41ce3665053ff9112a49db92f4e9225346702e83.tar.gz
Remove node_name lookup in knife ssh error handler
It is no longer used, but causes problems as action_nodes can sometimes contain nil entries (see skip on the loop in search_nodes to cater for this). Commit b57226b4a8c80b865cd3e256923ba07e5ac09749 removes the previous requirement for this.
-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}"