From 098516e80e8915209c9697ad16371d729b1846a3 Mon Sep 17 00:00:00 2001 From: Anton Kalyaev Date: Fri, 10 May 2013 15:45:50 +0400 Subject: [PATCH] respect :nic_type option for private network. Fixes #1704 --- CHANGELOG.md | 1 + plugins/providers/virtualbox/action/network.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4f320aa9..62ad713b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,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 diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb index 591583ffc..7fac26128 100644 --- a/plugins/providers/virtualbox/action/network.rb +++ b/plugins/providers/virtualbox/action/network.rb @@ -210,6 +210,7 @@ module VagrantPlugins options = { :auto_config => true, :mac => nil, + :nic_type => nil, :netmask => "255.255.255.0", :type => :static }.merge(options) @@ -269,7 +270,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