[DRE-commits] [vagrant-libvirt] 45/163: Merge pull request #217 from sstrato/add_management_network_mode

[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 44951a1f174cf3cfc322f41f183a4a9d484adc05
Merge: f8c69ea fad3665
Author: Dmitry Vasilets <pronix.service at gmail.com>
Date:   Sun Sep 28 16:19:57 2014 +0200

    Merge pull request #217 from sstrato/add_management_network_mode
    
     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 --cc lib/vagrant-libvirt/config.rb
index 7e8e402,4a4a6dd..9656848
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@@ -74,9 -71,9 +75,10 @@@ module VagrantPlugin
          @password          = UNSET_VALUE
          @id_ssh_key_file   = UNSET_VALUE
          @storage_pool_name = UNSET_VALUE
 +        @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
@@@ -188,9 -184,9 +190,10 @@@
          @password = nil if @password == UNSET_VALUE
          @id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == UNSET_VALUE
          @storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE
 +        @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

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