[DRE-commits] [vagrant-libvirt] 61/67: Merge branch 'improve_network_robustness' of github.com:sciurus/vagrant-libvirt into sciurus-improve_network_robustness

[Antonio Terceiro]

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

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

commit 90a20462c214a35c9e5b29d00b0052dff2b80795
Merge: e204e45 c323468
Author: dima <pronix.service at gmail.com>
Date:   Sat Jan 18 10:55:56 2014 +0100

    Merge branch 'improve_network_robustness' of github.com:sciurus/vagrant-libvirt into sciurus-improve_network_robustness
    
    Conflicts:
    	README.md
    	lib/vagrant-libvirt/config.rb

 README.md                                          |   6 +-
 .../action/create_network_interfaces.rb            |  25 +++-
 lib/vagrant-libvirt/action/create_networks.rb      | 157 +++++++++++++++------
 lib/vagrant-libvirt/config.rb                      |  11 +-
 lib/vagrant-libvirt/errors.rb                      |  16 ++-
 lib/vagrant-libvirt/util/libvirt_util.rb           |   7 +
 locales/en.yml                                     |   5 +
 7 files changed, 165 insertions(+), 62 deletions(-)

diff --cc README.md
index fe5b81e,9aae705..48e9b54
--- a/README.md
+++ b/README.md
@@@ -110,10 -110,6 +110,10 @@@ This provider exposes quite a few provi
  * `nested` - [Enable nested virtualization](https://github.com/torvalds/linux/blob/master/Documentation/virtual/kvm/nested-vmx.txt). Default is false.
  * `cpu_mode` - What cpu mode to use for nested virtualization. Defaults to 'host-model' if not set.
  * `volume_cache` - Controls the cache mechanism. Possible values are "default", "none", "writethrough", "writeback", "directsync" and "unsafe". [See driver->cache in libvirt documentation](http://libvirt.org/formatdomain.html#elementsDisks).
 +* `kernel` - To launch the guest with a kernel residing on host filesystems (Equivalent to qemu `-kernel`)
 +* `initrd` - To specify the initramfs/initrd to use for the guest (Equivalent to qemu `-initrd`)
 +* `cmd_line` - Arguments passed on to the guest kernel initramfs or initrd to use (Equivalent to qemu `-append`)
-  
++
  
  Specific domain settings can be set for each domain separately in multi-VM
  environment. Example below shows a part of Vagrantfile, where specific options
diff --cc lib/vagrant-libvirt/config.rb
index 3318fda,2502187..ec59f05
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@@ -26,11 -26,9 +26,12 @@@ module VagrantPlugin
        attr_accessor :storage_pool_name
  
        # Libvirt default network
-       attr_accessor :default_network
+       attr_accessor :management_network_name
+       attr_accessor :management_network_address
  
 +      # Default host prefix (alternative to use project folder name)
 +      attr_accessor :default_prefix
 +
        # Domain specific settings used while creating new domain.
        attr_accessor :memory
        attr_accessor :cpus

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