providers/virtualbox: set proper mac address on priv net [GH-3588]
This commit is contained in:
parent
53939d0a47
commit
9c420b8738
|
@ -62,6 +62,8 @@ BUG FIXES:
|
||||||
- commands/rsync-auto: Run properly on Windows. [GH-3547]
|
- commands/rsync-auto: Run properly on Windows. [GH-3547]
|
||||||
- providers/virtualbox: VirtalBox detection works properly again on
|
- providers/virtualbox: VirtalBox detection works properly again on
|
||||||
Windows when the `VBOX_INSTALL_PATH` has multiple elements. [GH-3549]
|
Windows when the `VBOX_INSTALL_PATH` has multiple elements. [GH-3549]
|
||||||
|
- providers/virtualbox: Forcing MAC address on private network works
|
||||||
|
properly again. [GH-3588]
|
||||||
- provisioners/salt: Always copy keys and configs on provision. [GH-3536]
|
- provisioners/salt: Always copy keys and configs on provision. [GH-3536]
|
||||||
- provisioners/salt: Install args should always be present with bootstrap.
|
- provisioners/salt: Install args should always be present with bootstrap.
|
||||||
- provisioners/salt: Overwrite keys properly on subsequent provisions [GH-3575]
|
- provisioners/salt: Overwrite keys properly on subsequent provisions [GH-3575]
|
||||||
|
|
|
@ -114,6 +114,7 @@ module VagrantPlugins
|
||||||
))
|
))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
p adapters
|
||||||
env[:machine].provider.driver.enable_adapters(adapters)
|
env[:machine].provider.driver.enable_adapters(adapters)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -343,7 +344,7 @@ module VagrantPlugins
|
||||||
return {
|
return {
|
||||||
:adapter => config[:adapter],
|
:adapter => config[:adapter],
|
||||||
:hostonly => interface[:name],
|
:hostonly => interface[:name],
|
||||||
:mac => config[:mac],
|
:mac_address => config[:mac],
|
||||||
:nic_type => config[:nic_type],
|
:nic_type => config[:nic_type],
|
||||||
:type => :hostonly
|
:type => :hostonly
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue