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

Merge pull request #1713 from akalyaev/respect-nec-type-option-for-private-networks-1704 

core: respect :nic_type option for private network. Fixes #1704
This commit is contained in:
Mitchell Hashimoto 2013-08-28 22:44:20 -07:00
parent 82006dfc96 098516e80e
commit 54ac2e8448
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -215,6 +215,7 @@ IMPROVEMENTS:
BUG FIXES: BUG FIXES:
- The `:nic_type` option for private networks is respected. [GH-1704]
- Ignore "guest not ready" errors when attempting to graceful halt and - Ignore "guest not ready" errors when attempting to graceful halt and
carry on checks whether the halt succeeded. [GH-1679] carry on checks whether the halt succeeded. [GH-1679]
- Handle the case where a roles path for Chef solo isn't properly - Handle the case where a roles path for Chef solo isn't properly

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

@ -212,6 +212,7 @@ module VagrantPlugins
options = { options = {
:auto_config => true, :auto_config => true,
:mac => nil, :mac => nil,
:nic_type => nil,
:netmask => "255.255.255.0", :netmask => "255.255.255.0",
:type => :static :type => :static
}.merge(options) }.merge(options)
@ -271,7 +272,7 @@ module VagrantPlugins
:ip => options[:ip], :ip => options[:ip],
:mac => options[:mac], :mac => options[:mac],
:netmask => options[:netmask], :netmask => options[:netmask],
:nic_type => nil, :nic_type => options[:nic_type],
:type => options[:type] :type => options[:type]
}.merge(dhcp_options) }.merge(dhcp_options)
end end