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

Merge pull request #217 from sstrato/add_management_network_mode

Browse Source 
add management network mode selection
This commit is contained in:
Dmitry Vasilets
2014-09-28 16:19:57 +02:00
parent f8c69ea4f9 fad3665547
commit 44951a1f17
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vagrant-libvirt/config.rb
View File

@@ -46,6 +46,7 @@ module VagrantPlugins
# Libvirt default network
attr_accessor :management_network_name
attr_accessor :management_network_address
attr_accessor :management_network_mode
# Default host prefix (alternative to use project folder name)
attr_accessor :default_prefix
@@ -77,6 +78,7 @@ module VagrantPlugins
@random_hostname = UNSET_VALUE
@management_network_name = UNSET_VALUE
@management_network_address = UNSET_VALUE
@management_network_mode = UNSET_VALUE
# Domain specific settings.
@memory = UNSET_VALUE
@@ -191,6 +193,7 @@ module VagrantPlugins
@random_hostname = false if @random_hostname == UNSET_VALUE
@management_network_name = 'vagrant-libvirt' if @management_network_name == UNSET_VALUE
@management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE
@management_network_mode = 'nat' if @management_network_address == UNSET_VALUE
# generate a URI if none is supplied
@uri = _generate_uri() if @uri == UNSET_VALUE

5
lib/vagrant-libvirt/util/network_util.rb
View File

@@ -10,7 +10,8 @@ module VagrantPlugins
def configured_networks(env, logger)
management_network_name = env[:machine].provider_config.management_network_name
management_network_address = env[:machine].provider_config.management_network_address
logger.info "Using #{management_network_name} at #{management_network_address} as the management network"
management_network_mode = env[:machine].provider_config.management_network_mode
logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
begin
management_network_ip = IPAddr.new(management_network_address)
@@ -33,7 +34,7 @@ module VagrantPlugins
ip: $1,
netmask: $2,
dhcp_enabled: true,
forward_mode: 'nat',
forward_mode: management_network_mode,
}
# add management network to list of networks to check