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:
commit
54ac2e8448
|
@ -215,6 +215,7 @@ IMPROVEMENTS:
|
|||
|
||||
BUG FIXES:
|
||||
|
||||
- The `:nic_type` option for private networks is respected. [GH-1704]
|
||||
- Ignore "guest not ready" errors when attempting to graceful halt and
|
||||
carry on checks whether the halt succeeded. [GH-1679]
|
||||
- Handle the case where a roles path for Chef solo isn't properly
|
||||
|
|
|
@ -212,6 +212,7 @@ module VagrantPlugins
|
|||
options = {
|
||||
:auto_config => true,
|
||||
:mac => nil,
|
||||
:nic_type => nil,
|
||||
:netmask => "255.255.255.0",
|
||||
:type => :static
|
||||
}.merge(options)
|
||||
|
@ -271,7 +272,7 @@ module VagrantPlugins
|
|||
:ip => options[:ip],
|
||||
:mac => options[:mac],
|
||||
:netmask => options[:netmask],
|
||||
:nic_type => nil,
|
||||
:nic_type => options[:nic_type],
|
||||
:type => options[:type]
|
||||
}.merge(dhcp_options)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue