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

providers/virtualbox: name for private network chooses right interface 

[GH-5389]
This commit is contained in:
Mitchell Hashimoto 2015-07-08 18:35:44 -06:00
parent 45a5bc3bd9
commit 536ea0729b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -102,6 +102,8 @@ BUG FIXES:
on Windows [GH-1483] on Windows [GH-1483]
- providers/virtualbox: Error if another user is running after a VM is - providers/virtualbox: Error if another user is running after a VM is
created to avoid issue with VirtualBox "losing" the VM [GH-5895] created to avoid issue with VirtualBox "losing" the VM [GH-5895]
- providers/virtualbox: The "name" setting on private networks will
choose an existing hostonly network [GH-5389]
- provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017] - provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017]
- provisioners/ansible: increase ansible connection timeout to 30 seconds [GH-5018] - provisioners/ansible: increase ansible connection timeout to 30 seconds [GH-5018]
- provisioners/ansible: disable color if Vagrant is not colored [GH-5531, GH-5532] - provisioners/ansible: disable color if Vagrant is not colored [GH-5531, GH-5532]

1
plugins/providers/virtualbox/action/network.rb
View File

@ -306,6 +306,7 @@ module VagrantPlugins
auto_config: options[:auto_config], auto_config: options[:auto_config],
ip: options[:ip], ip: options[:ip],
mac: options[:mac], mac: options[:mac],
name: options[:name],
netmask: options[:netmask], netmask: options[:netmask],
nic_type: options[:nic_type], nic_type: options[:nic_type],
type: options[:type] type: options[:type]