[DRE-commits] [vagrant-libvirt] 21/163: add management network mode selection

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.26
in repository vagrant-libvirt.

commit fad36655474a2bfc3d85a1048f1fdabc2bf44696
Author: sstrato.kong <sstrato.kong at gmail.com>
Date:   Fri Jul 25 13:42:39 2014 +0900

     add management network mode selection
---
 lib/vagrant-libvirt/config.rb            | 3 +++
 lib/vagrant-libvirt/util/network_util.rb | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb
index 3a8d48d..4a4a6dd 100644
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@ -43,6 +43,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
@@ -72,6 +73,7 @@ module VagrantPlugins
         @storage_pool_name = UNSET_VALUE
         @management_network_name    = UNSET_VALUE
         @management_network_address = UNSET_VALUE
+        @management_network_mode = UNSET_VALUE
 
         # Domain specific settings.
         @memory            = UNSET_VALUE
@@ -184,6 +186,7 @@ module VagrantPlugins
         @storage_pool_name = 'default' if @storage_pool_name == 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
diff --git a/lib/vagrant-libvirt/util/network_util.rb b/lib/vagrant-libvirt/util/network_util.rb
index 4c94039..dea45d5 100644
--- a/lib/vagrant-libvirt/util/network_util.rb
+++ b/lib/vagrant-libvirt/util/network_util.rb
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git