Merge pull request #1745 from jheise/master

providers/virtualbox: static ip addresses on public networks
This commit is contained in:
Mitchell Hashimoto 2013-09-02 15:10:33 -07:00
commit 154b32e561
1 changed files with 11 additions and 0 deletions

View File

@ -202,6 +202,17 @@ module VagrantPlugins
end
def bridged_network_config(config)
if config[:ip]
options = {
:auto_config => true,
:mac => nil,
:netmask => "255.255.255.0",
:type => :static
}.merge(config)
options[:type] = options[:type].to_sym
return options
end
return {
:type => :dhcp,
:use_dhcp_assigned_default_route => config[:use_dhcp_assigned_default_route]