NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use network 'default' if nothing more is specified in config.vm.network.

Browse Source
This commit is contained in:
pradels
2013-05-10 00:01:00 +02:00
parent 813a7c811e
commit 5dea377677
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vagrant-libvirt/action/create_networks.rb
View File

@@ -44,7 +44,7 @@ module VagrantPlugins
# (:libvirt__network_name => ...). # (:libvirt__network_name => ...).
@options = scoped_hash_override(options, :libvirt) @options = scoped_hash_override(options, :libvirt)
@options = { @options = {
:netmask => '255.255.255.0', :netmask => '255.255.255.0',
}.merge(@options) }.merge(@options)
# Prepare a hash describing network for this specific interface. # Prepare a hash describing network for this specific interface.
@@ -64,6 +64,13 @@ module VagrantPlugins
handle_ip_option(env) handle_ip_option(env)
elsif @options[:network_name] elsif @options[:network_name]
handle_network_name_option handle_network_name_option
else
# TODO Should be smarter than just using fixed 'default' string.
@interface_network = lookup_network_by_name('default')
if not @interface_network
raise Errors::NetworkNotAvailableError,
:network_name => 'default'
end
end end
autostart_network if not @interface_network[:autostart] autostart_network if not @interface_network[:autostart]
@@ -212,6 +219,7 @@ module VagrantPlugins
# First is address of network, second is gateway. Start the range two # First is address of network, second is gateway. Start the range two
# addresses after network address. # addresses after network address.
# TODO Detect if this IP is not set on the interface.
start_address = net.to_range.begin.succ.succ start_address = net.to_range.begin.succ.succ
# Stop address must not be broadcast. # Stop address must not be broadcast.