cluster_proxy.rb in ironfan-4.1.1

- old
+ new

@@ -46,11 +46,11 @@
         :short       => '-D',
         :description => 'Port to listen on for SOCKS5 proxy',
         :default     => '6666'
 
       def relevant?(server)
-        server.sshable?
+        server.machine.running?
       end
 
       def perform_execution(target)
         svr = target.first
         cmd = command_for_target(svr)
@@ -60,10 +60,10 @@
       end
 
       def command_for_target(svr)
         config[:attribute]       ||= Chef::Config[:knife][:ssh_address_attribute] || "fqdn"
         config[:ssh_user]        ||= Chef::Config[:knife][:ssh_user]
-        config[:identity_file]   ||= svr.cloud.ssh_identity_file
+        config[:identity_file]   ||= svr.server.cloud.ssh_identity_file
         config[:host_key_verify] ||= Chef::Config[:knife][:host_key_verify] || (not config[:no_host_key_verify]) # pre-vs-post 0.10.4
 
         address = svr.public_hostname
         if address.blank? && (svr.chef_node)
           address = format_for_display( svr.chef_node )[config[:attribute]]