lib/testlab/node/ssh.rb in testlab-0.4.3 vs lib/testlab/node/ssh.rb in testlab-0.4.4

@@ -28,15 +28,12 @@
             c.proxy_port      = @provider.port
             c.proxy_user      = @provider.user
             c.proxy_keys      = @provider.identity
 
             c.host_name       = container.ip
-            c.user            = (options[:user] || container.user)
-            if container.keys.nil?
-              c.password      = (options[:passwd] || container.passwd)
-            else
-              c.keys          = (options[:keys] || container.keys)
-            end
+            c.user            = (options[:user]   || container.user)
+            c.password        = (options[:passwd] || container.passwd)
+            c.keys            = (options[:keys]   || container.keys)
           end
         end
         @container_ssh[name]
       end