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

commands/rdp: support username param [GH-5460]

This commit is contained in:
Mitchell Hashimoto 2015-07-06 23:07:22 -06:00
parent f5dd9ec604
commit 0b9ec53f46
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ module VagrantPlugins
end end
rdp_info[:username] = username rdp_info[:username] = username
end end
if !rdp_info[:password] if !rdp_info[:password]
password = ssh_info[:password] password = ssh_info[:password]
if machine.config.vm.communicator == :winrm if machine.config.vm.communicator == :winrm
@ -77,9 +77,10 @@ module VagrantPlugins
end end
rdp_info[:password] = password rdp_info[:password] = password
end 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
rdp_info[:username] ||= machine.config.rdp.username
if rdp_info[:host] == "127.0.0.1" if rdp_info[:host] == "127.0.0.1"
# We need to find a forwarded port... # We need to find a forwarded port...

3
plugins/commands/rdp/config.rb
View File

@ -3,15 +3,18 @@ module VagrantPlugins
class Config < Vagrant.plugin("2", :config) class Config < Vagrant.plugin("2", :config)
attr_accessor :port attr_accessor :port
attr_accessor :search_port attr_accessor :search_port
attr_accessor :username
def initialize def initialize
@port = UNSET_VALUE @port = UNSET_VALUE
@search_port = UNSET_VALUE @search_port = UNSET_VALUE
@username = UNSET_VALUE
end end
def finalize! def finalize!
@port = 3389 if @port == UNSET_VALUE @port = 3389 if @port == UNSET_VALUE
@search_port = 3389 if @search_port == UNSET_VALUE @search_port = 3389 if @search_port == UNSET_VALUE
@username = nil if @username == UNSET_VALUE
end end
def validate(machine) def validate(machine)