lib/testlab/node/ssh.rb in testlab-0.6.12 vs lib/testlab/node/ssh.rb in testlab-0.6.14
- old
+ new
@@ -9,11 +9,11 @@
@ssh ||= ZTK::SSH.new({:ui => @ui, :timeout => 3600, :silence => true}.merge(options))
@ssh.config do |c|
c.host_name = @provider.ip
c.port = @provider.port
c.user = @provider.user
- c.keys = @provider.identity
+ c.keys = [@provider.identity].flatten.compact
end
end
@ssh
end
@@ -31,10 +31,10 @@
c.host_name = container.ip
c.user = (options[:user] || container.primary_user.id)
c.password = (options[:passwd] || container.primary_user.password)
- c.keys = (options[:keys] || [container.primary_user.identity, @provider.identity])
+ c.keys = (options[:keys] || [container.primary_user.identity, @provider.identity].flatten.compact)
end
end
@container_ssh[name]
end