vagrant-libvirt 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a7de8bcfdcab60b3237c7d64fd047fa9b43bbf8
+  data.tar.gz: f98b1b521b2d6665be337341791ae260244d29eb
+SHA512:
+  metadata.gz: 6d33e5ae966f1758ec327b73a9d3527cfa0b6c3ab461630beb4e13bc391c5f291ab04b48884bc0d568e2376ee3fda1361bce6efab0d3d5513b987f08f7b75513
+  data.tar.gz: 83408a1dcb5c55fd745e204b7d23f78cf1ec9d6e6eb5beb8a27f31cbff4154a916bd9068b7e80dade9318f97b504a77671171486ce954e65b9af73474487e151

data/Gemfile

@@ -4,11 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake'
-  gem 'rspec',       '~> 2.13.0'
-  gem 'rspec-fire',  require: 'rspec/fire'
-  gem 'rspec-spies', require: false
-  gem 'coveralls',   require: false
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
+  # We depend on Vagrant for development, but we don't add it as a
+  # gem dependency because we expect to be installed within the
+  # Vagrant environment itself using `vagrant plugin`.
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
 end
 

data/README.md

@@ -99,14 +99,19 @@ This provider exposes quite a few provider-specific configuration options:
 * `password` - Password to access Libvirt.
 * `id_ssh_key_file` - The id ssh key file name to access Libvirt (eg: id_dsa or id_rsa or ... in the user .ssh directory)
 * `storage_pool_name` - Libvirt storage pool name, where box image and instance snapshots will be stored.
-* `default_network` - Libvirt default network name. If not specified default network name is 'default'.
 
 ### Domain Specific Options
 
+* `disk_bus` - The type of disk device to emulate. Defaults to virtio if not set. Possible values are documented in libvirt's [description for _target_](http://libvirt.org/formatdomain.html#elementsDisks).
 * `memory` - Amount of memory in MBytes. Defaults to 512 if not set.
 * `cpus` - Number of virtual cpus. Defaults to 1 if not set.
 * `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
@@ -120,7 +125,7 @@ Vagrant.configure("2") do |config|
       domain.memory = 2048
       domain.cpus = 2
       domain.nested = true
-	  domain.volume_cache = 'none'
+      domain.volume_cache = 'none'
     end
   end
 
@@ -229,15 +234,24 @@ starts with 'libvirt__' string. Here is a list of those options:
   Default mode is 'bridge'.
 * `:mac` - MAC address for the interface.
 
-## Obtaining Domain IP Address
+### Management Network
+
+Vagrant-libvirt uses a private network to perform some management operations
+on VMs. All VMs will have an interface connected to this network and
+an IP address dynamically assigned by libvirt. This is in addition to any
+networks you configure. The name and address used by this network are
+configurable at the provider level.
+
+* `management_network_name` - Name of libvirt network to which all VMs will be connected. If not specified the default is 'vagrant-libvirt'.
+* `management_network_address` - Address of network to which all VMs will be connected. Must include the address and subnet mask. If not specified the default is '192.168.121.0/24'.
 
-Libvirt doesn't provide standard way how to find out an IP address of running
-domain. But we know, what is MAC address of virtual machine. Libvirt is closely
-connected with dnsmasq server, which acts also as a DHCP server. Dnsmasq server
-makes lease information public in `/var/lib/libvirt/dnsmasq` directory, or in
-`/var/lib/misc/dnsmasq.leases` file on some systems. This is the place, where
-information like which MAC address has which IP address resides and it's parsed
-by vagrant-libvirt plugin.
+You may wonder how vagrant-libvirt knows the IP address a VM received.
+Libvirt doesn't provide a standard way to find out the IP address of a running
+domain. But we do know the MAC address of the virtual machine's interface on
+the management network. Libvirt is closely connected with dnsmasq, which acts as
+a DHCP server. dnsmasq writes lease information in the `/var/lib/libvirt/dnsmasq`
+directory. Vagrant-libvirt looks for the MAC address in this file and extracts
+the corresponding IP address.
 
 ## SSH Access To VM
 

data/Rakefile

@@ -2,7 +2,6 @@
 
 #require 'rubygems'
 #require 'bundler/setup'
-Dir['./tasks/**/*.rake'].each { |f| load f }
 require 'bundler/gem_tasks'
 Bundler::GemHelper.install_tasks
 task default: [:deftask]

data/example_box/Vagrantfile

@@ -52,6 +52,9 @@ Vagrant.configure("2") do |config|
     # Libvirt storage pool name, where box image and instance snapshots will
     # be stored.
     libvirt.storage_pool_name = "default"
+
+    # Set a prefix for the machines that's different than the project dir name.
+    #libvirt.default_prefix = ''
   end
 end
 

data/lib/vagrant-libvirt/action.rb

@@ -25,7 +25,13 @@ module VagrantPlugins
               b2.use CreateNetworks
               b2.use CreateNetworkInterfaces
 
-              b2.use NFS
+              if Vagrant::VERSION < "1.4.0"
+                b2.use NFS
+              else
+                b2.use SyncedFolderCleanup
+                b2.use SyncedFolders
+              end
+
               b2.use PrepareNFSSettings
               b2.use ShareFolders
               b2.use SetHostname
@@ -51,19 +57,32 @@ module VagrantPlugins
             next if env[:result]
 
             b2.use Call, IsSuspended do |env2, b3|
+              # if vm is suspended resume it then exit
               if env2[:result]
                 b3.use ResumeDomain
                 next
               end
 
-              # VM is not running or suspended. Start it.. Machine should gain
-              # IP address when comming up, so wait for dhcp lease and store IP
-              # into machines data_dir.
-              b3.use NFS
+              # VM is not running or suspended.
+
+              # Ensure networks are created and active
+              b3.use CreateNetworks
+
+              # Handle shared folders
+              if Vagrant::VERSION < "1.4.0"
+                b3.use NFS
+              else
+                b3.use SyncedFolderCleanup
+                b3.use SyncedFolders
+              end
               b3.use PrepareNFSSettings
               b3.use ShareFolders
 
+              # Start it..
               b3.use StartDomain
+
+              # Machine should gain IP address when comming up,
+              # so wait for dhcp lease and store IP into machines data_dir.
               b3.use WaitTillUp
             end
           end
@@ -302,6 +321,10 @@ module VagrantPlugins
       autoload :WaitTillUp, action_root.join('wait_till_up')
       autoload :SSHRun,  'vagrant/action/builtin/ssh_run'
       autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url'
+      unless Vagrant::VERSION < "1.4.0"
+        autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
+        autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
+      end
     end
   end
 end

data/lib/vagrant-libvirt/action/connect_libvirt.rb

@@ -67,13 +67,9 @@ module VagrantPlugins
           conn_attr[:libvirt_password] = config.password if config.password
 
           # Setup command for retrieving IP address for newly created machine
-          # with some MAC address. Get it from dnsmasq leases table - either
-          # /var/lib/libvirt/dnsmasq/*.leases files, or
-          # /var/lib/misc/dnsmasq.leases if available.
-          ip_command =  "LEASES='/var/lib/libvirt/dnsmasq/*.leases'; "
-          ip_command << "[ -f /var/lib/misc/dnsmasq.leases ] && "
-          ip_command << "LEASES='/var/lib/misc/dnsmasq.leases'; "
-          ip_command << "grep $mac $LEASES | awk '{ print $3 }'"
+          # with some MAC address. Get it from dnsmasq leases table
+          ip_command =  %q[ LEASES=$(find /var/lib/libvirt/dnsmasq/ /var/lib/misc/ -name '*leases'); ]
+          ip_command << %q[ [ -n "$LEASES" ] && grep $mac $LEASES | awk '{ print $3 }' ]
           conn_attr[:libvirt_ip_command] = ip_command
 
           @logger.info("Connecting to Libvirt (#{uri}) ...")

data/lib/vagrant-libvirt/action/create_domain.rb

@@ -19,9 +19,14 @@ module VagrantPlugins
           # Gather some info about domain
           @name = env[:domain_name]
           @cpus = config.cpus
+          @cpu_mode = config.cpu_mode
+          @disk_bus = config.disk_bus
           @nested = config.nested
           @memory_size = config.memory*1024
           @domain_volume_cache = config.volume_cache
+          @kernel = config.kernel
+          @cmd_line = config.cmd_line
+          @initrd = config.initrd
 
           # TODO get type from driver config option
           @domain_type = 'kvm'
@@ -44,6 +49,9 @@ module VagrantPlugins
           env[:ui].info(" -- Storage pool:  #{env[:machine].provider_config.storage_pool_name}")
           env[:ui].info(" -- Image:         #{@domain_volume_path}")
           env[:ui].info(" -- Volume Cache:  #{@domain_volume_cache}")
+          env[:ui].info(" -- Kernel:        #{@kernel}")
+          env[:ui].info(" -- Initrd:        #{@initrd}")
+          env[:ui].info(" -- Command line : #{@cmd_line}")
 
           # Create libvirt domain.
           # Is there a way to tell fog to create new domain with already

data/lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
 
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::create_network_interfaces')
-          @default_network = env[:machine].provider_config.default_network;
+          @management_network_name = env[:machine].provider_config.management_network_name
           @app = app
         end
 
@@ -37,6 +37,7 @@ module VagrantPlugins
 
           # Assign interfaces to slots.
           env[:machine].config.vm.networks.each do |type, options|
+            @logger.debug "In config found network type #{type} options #{options}"
 
             # Get options for this interface. Options can be specified in
             # Vagrantfile in short format (:ip => ...), or provider format
@@ -51,8 +52,10 @@ module VagrantPlugins
               end
 
               free_slot = options[:adapter].to_i
+              @logger.debug "Using specified adapter slot #{free_slot}"
             else
               free_slot = find_empty(adapters)
+              @logger.debug "Adapter not specified so found slot #{free_slot}"
               raise Errors::InterfaceSlotNotAvailable if free_slot == nil
             end
 
@@ -104,6 +107,7 @@ module VagrantPlugins
             # it has to be available during provisioning - ifdown command is
             # not acceptable here.
             next if slot_number == 0
+            @logger.debug "Configuring interface slot_number #{slot_number} options #{options}"
 
             network = {
               :interface => slot_number,
@@ -139,7 +143,10 @@ module VagrantPlugins
 
         # Return network name according to interface options.
         def interface_network(libvirt_client, options)
-          return options[:network_name] if options[:network_name]
+          if options[:network_name]
+            @logger.debug "Found network by name"
+            return options[:network_name]
+          end
 
           # Get list of all (active and inactive) libvirt networks.
           available_networks = libvirt_networks(libvirt_client)
@@ -147,12 +154,20 @@ module VagrantPlugins
           if options[:ip]
             address = network_address(options[:ip], options[:netmask])
             available_networks.each do |network|
-              return network[:name] if address == network[:network_address]
+              if address == network[:network_address]
+                @logger.debug "Found network by ip"
+                return network[:name]
+              end
             end
           end
 
-          # TODO Network default can be missing or named different.
-          return @default_network;
+          # the management network always gets attached to slot 0
+          # because the first network is of type forwarded_port.
+          # this is confusing.
+          # TODO only iterate over networks of type private_network
+          # and prepend the management network to that list
+          @logger.debug "Did not find network so using default of #{@management_network_name}"
+          @management_network_name
         end
       end
     end

data/lib/vagrant-libvirt/action/create_networks.rb

@@ -2,6 +2,7 @@ require 'log4r'
 require 'vagrant/util/network_ip'
 require 'vagrant/util/scoped_hash_override'
 require 'ipaddr'
+require 'thread'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -13,6 +14,8 @@ module VagrantPlugins
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
         include VagrantPlugins::ProviderLibvirt::Util::LibvirtUtil
 
+        @@lock = Mutex.new
+
         def initialize(app, env)
           mess = 'vagrant_libvirt::action::create_networks'
           @logger = Log4r::Logger.new(mess)
@@ -25,60 +28,98 @@ module VagrantPlugins
 
         def call(env)
 
-          # Iterate over networks requested from config. If some network is not
-          # available, create it if possible. Otherwise raise an error.
-          env[:machine].config.vm.networks.each do |type, options|
+          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"
 
-            # Get a list of all (active and inactive) libvirt networks. This
-            # list is used throughout this class and should be easier to
-            # process than libvirt API calls.
-            @available_networks = libvirt_networks(env[:libvirt_compute].client)
+          begin
+            management_network_ip = IPAddr.new(management_network_address)
+          rescue ArgumentError
+            raise Errors::ManagementNetworkError,
+              error_message: "#{management_network_address} is not a valid IP address"
+          end
 
-            # Now, we support private networks only. There are two other types
-            # public network and port forwarding, but there are problems with
-            # creating them via libvirt API, so this provider doesn't implement
-            # them.
-            next if type != :private_network
+          # capture address into $1 and mask into $2
+          management_network_ip.inspect =~ /IPv4:(.*)\/(.*)>/
 
-            # Get options for this interface network. Options can be specified
-            # in Vagrantfile in short format (:ip => ...), or provider format
-            # (:libvirt__network_name => ...).
-            @options = scoped_hash_override(options, :libvirt)
-            @options = {
+          if $2 == '255.255.255.255'
+            raise Errors::ManagementNetworkError,
+              error_message: "#{management_network_address} does not include both an address and subnet mask"
+          end
+
+          management_network_options = {
+            network_name: management_network_name,
+            ip: $1,
+            netmask: $2,
+            dhcp_enabled: true,
+            forward_mode: 'nat',
+          }
+
+          # add management network to list of networks to check
+          networks = [ management_network_options ]
+
+          env[:machine].config.vm.networks.each do |type, original_options|
+            # There are two other types public network and port forwarding,
+            # but there are problems with creating them via libvirt API,
+            # so this provider doesn't implement them.
+            next if type != :private_network
+            # Options can be specified in Vagrantfile in short format (:ip => ...),
+            # or provider format # (:libvirt__network_name => ...).
+            # https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/util/scoped_hash_override.rb
+            options = scoped_hash_override(original_options, :libvirt)
+            # use default values if not already set
+            options = {
               netmask:      '255.255.255.0',
               dhcp_enabled: true,
               forward_mode: 'nat',
-            }.merge(@options)
-
-            # Prepare a hash describing network for this specific interface.
-            @interface_network = {
-              name:             nil,
-              ip_address:       nil,
-              netmask:          @options[:netmask],
-              network_address:  nil,
-              bridge_name:      nil,
-              created:          false,
-              active:           false,
-              autostart:        false,
-              libvirt_network:  nil,
-            }
-
-            if @options[:ip]
-              handle_ip_option(env)
-            elsif @options[:network_name]
-              handle_network_name_option
-            else
-              # TODO: Should be smarter than just using fixed 'default' string.
-              @interface_network = lookup_network_by_name('default')
-              if !@interface_network
-                raise Errors::NetworkNotAvailableError,
-                      network_name: 'default'
+            }.merge(options)
+            # add to list of networks to check
+            networks.push(options)
+          end
+
+          # only one vm at a time should try to set up networks
+          # otherwise they'll have inconsitent views of current state
+          # and conduct redundant operations that cause errors
+          @@lock.synchronize do
+            # Iterate over networks If some network is not
+            # available, create it if possible. Otherwise raise an error.
+            networks.each do |options|
+              @logger.debug "Searching for network with options #{options}"
+
+              # should fix other methods so this doesn't have to be instance var
+              @options = options
+
+              # Get a list of all (active and inactive) libvirt networks. This
+              # list is used throughout this class and should be easier to
+              # process than libvirt API calls.
+              @available_networks = libvirt_networks(env[:libvirt_compute].client)
+
+              # Prepare a hash describing network for this specific interface.
+              @interface_network = {
+                name:             nil,
+                ip_address:       nil,
+                netmask:          @options[:netmask],
+                network_address:  nil,
+                bridge_name:      nil,
+                created:          false,
+                active:           false,
+                autostart:        false,
+                libvirt_network:  nil,
+              }
+
+              if @options[:ip]
+                handle_ip_option(env)
+              # in vagrant 1.2.3 and later it is not possible to take this branch
+              # because cannot have name without ip
+              # https://github.com/mitchellh/vagrant/commit/cf2f6da4dbcb4f57c9cdb3b94dcd0bba62c5f5fd
+              elsif @options[:network_name]
+                handle_network_name_option
               end
-            end
 
-            autostart_network if !@interface_network[:autostart]
-            activate_network if !@interface_network[:active]
+              autostart_network if !@interface_network[:autostart]
+              activate_network if !@interface_network[:active]
           end
+        end
 
           @app.call(env)
         end
@@ -87,6 +128,7 @@ module VagrantPlugins
 
         # Return hash of network for specified name, or nil if not found.
         def lookup_network_by_name(network_name)
+          @logger.debug "looking up network named #{network_name}"
           @available_networks.each do |network|
             return network if network[:name] == network_name
           end
@@ -95,12 +137,25 @@ module VagrantPlugins
 
         # Return hash of network for specified bridge, or nil if not found.
         def lookup_bridge_by_name(bridge_name)
+          @logger.debug "looking up bridge named #{bridge_name}"
           @available_networks.each do |network|
             return network if network[:bridge_name] == bridge_name
           end
           nil
         end
 
+        # Throw an error if dhcp setting for an existing network does not
+        # match what was configured in the vagrantfile
+        # since we always enable dhcp for the management network
+        # this ensures we wont start a vm vagrant cant reach
+        def verify_dhcp
+          unless @options[:dhcp_enabled] == @interface_network[:dhcp_enabled]
+            raise Errors::DHCPMismatch,
+                  network_name: @interface_network[:name],
+                  requested: @options[:dhcp_enabled] ? 'enabled' : 'disabled'
+          end
+        end
+
         # Handle only situations, when ip is specified. Variables @options and
         # @available_networks should be filled before calling this function.
         def handle_ip_option(env)
@@ -120,11 +175,18 @@ module VagrantPlugins
             if available_network[:network_address] == \
             @interface_network[:network_address]
               @interface_network = available_network
+              @logger.debug "found existing network by ip, values are"
+              @logger.debug @interface_network
               break
             end
           end
 
+          if @interface_network[:created]
+            verify_dhcp
+          end
+
           if @options[:network_name]
+            @logger.debug "Checking that network name does not clash with ip"
             if @interface_network[:created]
               # Just check for mismatch error here - if name and ip from
               # config match together.
@@ -156,6 +218,7 @@ module VagrantPlugins
             # Is name for new network set? If not, generate a unique one.
             count = 0
             while @interface_network[:name].nil?
+              @logger.debug "generating name for network"
 
               # Generate a network name.
               network_name = env[:root_path].basename.to_s.dup
@@ -171,6 +234,7 @@ module VagrantPlugins
             # Generate a unique name for network bridge.
             count = 0
             while @interface_network[:bridge_name].nil?
+              @logger.debug "generating name for bridge"
               bridge_name = 'virbr'
               bridge_name << count.to_s
               count += 1
@@ -195,6 +259,8 @@ module VagrantPlugins
           if !@interface_network
             raise Errors::NetworkNotAvailableError,
                   network_name: @options[:network_name]
+          else
+            verify_dhcp
           end
         end
 
@@ -234,6 +300,7 @@ module VagrantPlugins
           begin
             @interface_network[:libvirt_network] = \
               @libvirt_client.define_network_xml(to_xml('private_network'))
+            @logger.debug "created network"
           rescue => e
             raise Errors::CreateNetworkError, error_message: e.message
           end

data/lib/vagrant-libvirt/action/destroy_networks.rb

@@ -18,7 +18,7 @@ module VagrantPlugins
           # data directory, created_networks file holds UUIDs of each network.
           created_networks_file = env[:machine].data_dir + 'created_networks'
 
-          @logger.info 'Attepmt destroy network'
+          @logger.info 'Checking if any networks were created'
           # If created_networks file doesn't exist, there are no networks we
           # need to remove.
           unless File.exist?(created_networks_file)
@@ -26,39 +26,45 @@ module VagrantPlugins
             return @app.call(env)
           end
 
-          @logger.info 'file with network exists'
+          @logger.info 'File with created networks exists'
 
           # Iterate over each created network UUID and try to remove it.
           created_networks = []
           file = File.open(created_networks_file, 'r')
           file.readlines.each do |network_uuid|
-            @logger.info network_uuid
+            @logger.info "Checking for #{network_uuid}"
+            # lookup_network_by_uuid throws same exception
+            # if there is an error or if the network just doesn't exist
             begin
               libvirt_network = env[:libvirt_compute].client.lookup_network_by_uuid(
                 network_uuid)
-            rescue
-              raise network_uuid
-              next
+            rescue Libvirt::RetrieveError => e
+              # this network is already destroyed, so move on
+              if e.message =~ /Network not found/
+                @logger.info "It is already undefined"
+                next
+              # some other error occured, so raise it again
+              else
+                raise e
+              end
             end
 
-            # Maybe network doesn't exist anymore.
-            next unless libvirt_network
-
             # Skip removing if network has still active connections.
             xml = Nokogiri::XML(libvirt_network.xml_desc)
             connections = xml.xpath('/network/@connections').first
-            @logger.info connections
             if connections != nil
+              @logger.info "Still has connections so will not undefine"
               created_networks << network_uuid
               next
             end
 
-            # Shutdown network first.
-            libvirt_network.destroy
 
+            # Shutdown network first.
             # Undefine network.
             begin
+              libvirt_network.destroy
               libvirt_network.undefine
+              @logger.info "Undefined it"
             rescue => e
               raise Error::DestroyNetworkError,
                 network_name: libvirt_network.name,
@@ -68,13 +74,16 @@ module VagrantPlugins
           file.close
 
           # Update status of created networks after removing some/all of them.
+          # Not sure why we are doing this, something else seems to always delete the file
           if created_networks.length > 0
             File.open(created_networks_file, 'w') do |file|
+              @logger.info "Writing new created_networks file"
               created_networks.each do |network_uuid|
                 file.puts network_uuid
               end
             end
           else
+            @logger.info "Deleting created_networks file"
             File.delete(created_networks_file)
           end
 

data/lib/vagrant-libvirt/action/set_name_of_domain.rb

@@ -5,21 +5,31 @@ module VagrantPlugins
       # Setup name for domain and domain volumes.
       class SetNameOfDomain
         def initialize(app, env)
+          @logger     = Log4r::Logger.new("vagrant_libvirt::action::set_name_of_domain")
           @app = app
         end
 
         def call(env)
           require 'securerandom'
-          env[:domain_name] = env[:root_path].basename.to_s.dup
+          config = env[:machine].provider_config
+          if config.default_prefix.nil?
+            env[:domain_name] = env[:root_path].basename.to_s.dup
+          else
+            env[:domain_name] = config.default_prefix.to_s
+          end
           env[:domain_name].gsub!(/[^-a-z0-9_]/i, '')
           env[:domain_name] << '_'
           env[:domain_name] << env[:machine].name.to_s
-
+          
+          @logger.info("Looking for domain #{env[:domain_name]} through list #{env[:libvirt_compute].servers.all}")
           # Check if the domain name is not already taken
           domain = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].servers.all, env[:domain_name])
+
+          @logger.info("Looking for domain #{env[:domain_name]}")
+
           if domain != nil
-            raise Vagrant::Errors::DomainNameExists,
+            raise ProviderLibvirt::Errors::DomainNameExists,
               :domain_name => env[:domain_name]
           end
 

data/lib/vagrant-libvirt/action/share_folders.rb

@@ -1,4 +1,4 @@
-require "pathname"
+require 'pathname'
 
 require "log4r"
 

data/lib/vagrant-libvirt/action/sync_folders.rb

@@ -27,7 +27,7 @@ module VagrantPlugins
             # avoid creating an additional directory with rsync
             hostpath = "#{hostpath}/" if hostpath !~ /\/$/
 
-            env[:ui].info(I18n.t("vagrant_libvirt.rsync_folder",
+            env[:ui].info(I18n.t('vagrant_libvirt.rsync_folder',
                                 :hostpath => hostpath,
                                 :guestpath => guestpath))
 
@@ -38,9 +38,9 @@ module VagrantPlugins
 
             # Rsync over to the guest path using the SSH info
             command = [
-              "rsync", "--del", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/",
-              "-e", "ssh -p #{ssh_info[:port]} #{proxycommand} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              'rsync', '--del', '--verbose', '--archive', '-z',
+              '--exclude', '.vagrant/',
+              '-e', "ssh -p #{ssh_info[:port]} #{proxycommand} -o StrictHostKeyChecking=no  #{ssh_key_options(ssh_info)}",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
@@ -53,6 +53,12 @@ module VagrantPlugins
             end
           end
         end
+        private
+
+        def ssh_key_options(ssh_info)
+          # Ensure that `private_key_path` is an Array (for Vagrant < 1.4)
+          Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join
+        end
       end
     end
   end

data/lib/vagrant-libvirt/config.rb

@@ -26,13 +26,22 @@ module VagrantPlugins
       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
+      attr_accessor :cpu_mode
+      attr_accessor :disk_bus
       attr_accessor :nested
       attr_accessor :volume_cache
+      attr_accessor :kernel
+      attr_accessor :cmd_line
+      attr_accessor :initrd
 
       def initialize
         @driver            = UNSET_VALUE
@@ -42,13 +51,19 @@ module VagrantPlugins
         @password          = UNSET_VALUE
         @id_ssh_key_file   = UNSET_VALUE
         @storage_pool_name = UNSET_VALUE
-        @default_network   = UNSET_VALUE
+        @management_network_name    = UNSET_VALUE
+        @management_network_address = UNSET_VALUE
 
         # Domain specific settings.
         @memory            = UNSET_VALUE
         @cpus              = UNSET_VALUE
+        @cpu_mode          = UNSET_VALUE
+        @disk_bus          = UNSET_VALUE
         @nested            = UNSET_VALUE
         @volume_cache      = UNSET_VALUE
+        @kernel            = UNSET_VALUE
+        @initrd            = UNSET_VALUE
+        @cmd_line          = UNSET_VALUE
       end
 
       def finalize!
@@ -59,13 +74,19 @@ module VagrantPlugins
         @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
-        @default_network = 'default' if @default_network == 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
 
         # Domain specific settings.
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
+        @cpu_mode = 'host-model' if @cpu_mode == UNSET_VALUE
+        @disk_bus = 'virtio' if @disk_bus == UNSET_VALUE
         @nested = false if @nested == UNSET_VALUE
         @volume_cache = 'default' if @volume_cache == UNSET_VALUE
+        @kernel = nil if @kernel == UNSET_VALUE
+        @cmd_line = '' if @cmd_line == UNSET_VALUE
+        @initrd = '' if @initrd == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-libvirt/errors.rb

@@ -68,16 +68,19 @@ module VagrantPlugins
         error_key(:fog_create_server_error)
       end
 
-
-      # Other exceptions
-      class InterfaceSlotNotAvailable < VagrantLibvirtError
-        error_key(:interface_slot_not_available)
+      # Network exceptions
+      class ManagementNetworkError < VagrantLibvirtError
+        error_key(:management_network_error)
       end
 
       class NetworkNameAndAddressMismatch < VagrantLibvirtError
         error_key(:network_name_and_address_mismatch)
       end
 
+      class DHCPMismatch < VagrantLibvirtError
+        error_key(:dhcp_mismatch)
+      end
+
       class CreateNetworkError < VagrantLibvirtError
         error_key(:create_network_error)
       end
@@ -98,12 +101,17 @@ module VagrantPlugins
         error_key(:activate_network_error)
       end
 
+      # Other exceptions
+      class InterfaceSlotNotAvailable < VagrantLibvirtError
+        error_key(:interface_slot_not_available)
+      end
+
       class RsyncError < VagrantLibvirtError
         error_key(:rsync_error)
       end
 
       class DomainNameExists < VagrantLibvirtError
-        error_key(:domain_name_exists_error)
+        error_key(:domain_name_exists)
       end
 
       class NoDomainError < VagrantLibvirtError

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -4,7 +4,7 @@
   <vcpu><%= @cpus %></vcpu>
 
   <% if @nested %>
-    <cpu mode='host-model'>
+    <cpu mode='<%= @cpu_mode %>'>
       <model fallback='allow'>qemu64</model>
       <feature policy='optional' name='vmx'/>
       <feature policy='optional' name='svm'/>
@@ -14,6 +14,9 @@
   <os>
     <type arch='x86_64'>hvm</type>
     <boot dev='hd'/>
+    <kernel><%= @kernel %></kernel>
+    <initrd><%= @initrd %></initrd>
+    <cmdline><%= @cmd_line %></cmdline>
   </os>
   <features>
     <acpi/>
@@ -26,7 +29,7 @@
       <driver name='qemu' type='qcow2' cache='<%= @domain_volume_cache %>'/>
       <source file='<%= @domain_volume_path %>'/>
       <%# we need to ensure a unique target dev -%>
-      <target dev='vda' bus='virtio'/>
+      <target dev='vda' bus='<%= @disk_bus %>'/>
     </disk>
     <serial type='pty'>
       <target port='0'/>

data/lib/vagrant-libvirt/util/libvirt_util.rb

@@ -27,6 +27,12 @@ module VagrantPlugins
             netmask = xml.xpath('/network/ip/@netmask').first
             netmask = netmask.value if netmask
 
+            if xml.at_xpath('//network/ip/dhcp')
+              dhcp_enabled = true
+            else
+              dhcp_enabled = false
+            end
+
             # Calculate network address of network from ip address and
             # netmask.
             if ip && netmask
@@ -40,6 +46,7 @@ module VagrantPlugins
               ip_address:       ip,
               netmask:          netmask,
               network_address:  network_address,
+              dhcp_enabled:     dhcp_enabled,
               bridge_name:      libvirt_network.bridge_name,
               created:          true,
               active:           libvirt_network.active?,

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.13'
+    VERSION = '0.0.14'
   end
 end

data/locales/en.yml

@@ -89,7 +89,7 @@ en:
       fog_create_server_error: |-
         Error while creating domain: %{error_message}
       domain_name_exists: |-
-        Name of domain about to create is already taken. Please try to run
+        Name `%{domain_name}` of domain about to create is already taken. Please try to run
         `vagrant up` command again.
       creating_storage_pool_error: |-
         There was error while creating libvirt storage pool: %{error_message}
@@ -101,9 +101,14 @@ en:
         Error while attaching new device to domain. %{error_message}
       no_ip_address_error: |-
         No IP address found.
+      management_network_error: |-
+        Error in specification of management network: %{error_message}.
       network_name_and_address_mismatch: |-
         Address %{ip_address} does not match with network name %{network_name}.
         Please fix your configuration and run vagrant again.
+      dhcp_mismatch: |-
+        Network %{network_name} exists but does not have dhcp %{requested}.
+        Please fix your configuration and run vagrant again.
       create_network_error: |-
         Error occured while creating new network: %{error_message}.
       network_not_available_error: |-

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -31,23 +28,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-libvirt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -63,17 +56,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant provider for libvirt.
@@ -84,7 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -146,27 +137,25 @@ files:
 homepage: https://github.com/pradels/vagrant-libvirt
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Vagrant provider for libvirt.
 test_files: []
-has_rdoc: