From 9c420b8738ca71161f81a8b6e83463e822fc7e48 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 30 Apr 2014 17:09:29 -0700 Subject: [PATCH] providers/virtualbox: set proper mac address on priv net [GH-3588] --- CHANGELOG.md | 2 ++ plugins/providers/virtualbox/action/network.rb | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58aa466a2..9d6ed2d03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,8 @@ BUG FIXES: - commands/rsync-auto: Run properly on Windows. [GH-3547] - providers/virtualbox: VirtalBox detection works properly again on 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: Install args should always be present with bootstrap. - provisioners/salt: Overwrite keys properly on subsequent provisions [GH-3575] diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb index 961947370..3f10d11bc 100644 --- a/plugins/providers/virtualbox/action/network.rb +++ b/plugins/providers/virtualbox/action/network.rb @@ -114,6 +114,7 @@ module VagrantPlugins )) end + p adapters env[:machine].provider.driver.enable_adapters(adapters) end @@ -341,11 +342,11 @@ module VagrantPlugins end return { - :adapter => config[:adapter], - :hostonly => interface[:name], - :mac => config[:mac], - :nic_type => config[:nic_type], - :type => :hostonly + :adapter => config[:adapter], + :hostonly => interface[:name], + :mac_address => config[:mac], + :nic_type => config[:nic_type], + :type => :hostonly } end