haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4726 from databus23/patch-3 

Add password to rdp_info hash
This commit is contained in:
Seth Vargo 2015-05-30 12:18:29 -07:00
parent 22eacd3f23 8990e18e6d
commit bf45aa6233
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/commands/rdp/command.rb
View File

@ -69,7 +69,15 @@ module VagrantPlugins
end end
rdp_info[:username] = username rdp_info[:username] = username
end end
if !rdp_info[:password]
password = ssh_info[:password]
if machine.config.vm.communicator == :winrm
password = machine.config.winrm.password
end
rdp_info[:password] = password
end
rdp_info[:host] ||= ssh_info[:host] rdp_info[:host] ||= ssh_info[:host]
rdp_info[:port] ||= machine.config.rdp.port rdp_info[:port] ||= machine.config.rdp.port