lib/rundock/backend.rb in rundock-0.5.8 vs lib/rundock/backend.rb in rundock-1.0.0
- old
+ new
@@ -115,11 +115,11 @@
Net::SSH::Config.for(options[:host], [options[:ssh_config]])
else
Net::SSH::Config.for(options[:host])
end
- # priority = node_attributes > cli options
- ssh_opts[:host_name] = options[:host]
+ # priority = (cli options > scenario target information section > ssh config)
+ ssh_opts[:host_name] = options[:host] unless ssh_opts[:host_name]
ssh_opts[:keys] = Array(options[:key]) if options[:key]
ssh_opts[:password] = parse_password_from_stdin if options[:ask_password]
ssh_opts.merge!(filter_net_ssh_options(options))
ssh_opts[:proxy] = Kernel.eval(options[:proxy]) if options[:proxy]