vagrant-libvirt 0.0.45 → 0.1.0

data/lib/vagrant-libvirt/action.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
       include Vagrant::Action::Builtin
       @logger = Log4r::Logger.new('vagrant_libvirt::action')
 
-      # remove image from libvirt storage pool
+      # remove image from Libvirt storage pool
       def self.remove_libvirt_image
         Vagrant::Action::Builder.new.tap do |b|
           b.use RemoveLibvirtImage
@@ -187,7 +187,7 @@ module VagrantPlugins
             b2.use Call, DestroyConfirm do |env2, b3|
               if env2[:result]
                 b3.use ClearForwardedPorts
-                # b3.use PruneNFSExports
+                b3.use PruneNFSExports
                 b3.use DestroyDomain
                 b3.use DestroyNetworks
                 b3.use ProvisionerCleanup

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

@@ -33,10 +33,13 @@ module VagrantPlugins
           @name = env[:domain_name]
           @uuid = config.uuid
           @cpus = config.cpus.to_i
+          @cpuset = config.cpuset
           @cpu_features = config.cpu_features
           @cpu_topology = config.cpu_topology
+          @nodeset = config.nodeset
           @features = config.features
           @features_hyperv = config.features_hyperv
+          @shares = config.shares
           @cpu_mode = config.cpu_mode
           @cpu_model = config.cpu_model
           @cpu_fallback = config.cpu_fallback
@@ -81,6 +84,7 @@ module VagrantPlugins
 
           # Storage
           @storage_pool_name = config.storage_pool_name
+          @snapshot_pool_name = config.snapshot_pool_name
           @disks = config.disks
           @cdroms = config.cdroms
 
@@ -106,6 +110,12 @@ module VagrantPlugins
           @redirdevs = config.redirdevs
           @redirfilters = config.redirfilters
 
+          # Additional QEMU commandline arguments
+          @qemu_args = config.qemu_args
+
+          # Additional QEMU commandline environment variables
+          @qemu_env = config.qemu_env
+
           # smartcard device
           @smartcard_dev = config.smartcard_dev
 
@@ -119,13 +129,15 @@ module VagrantPlugins
 
           # Get path to domain image from the storage pool selected if we have a box.
           if env[:machine].config.vm.box
-            actual_volumes =
-              env[:machine].provider.driver.connection.volumes.all.select do |x|
-                x.pool_name == @storage_pool_name
-              end
-            domain_volume = ProviderLibvirt::Util::Collection.find_matching(
-              actual_volumes, "#{@name}.img"
-            )
+            if @snapshot_pool_name != @storage_pool_name
+                pool_name = @snapshot_pool_name
+            else
+                pool_name = @storage_pool_name
+            end
+            @logger.debug "Search for volume in pool: #{pool_name}"
+            domain_volume = env[:machine].provider.driver.connection.volumes.all(
+              name: "#{@name}.img"
+            ).find { |x| x.pool_name == pool_name }
             raise Errors::DomainVolumeExists if domain_volume.nil?
             @domain_volume_path = domain_volume.path
           end
@@ -155,26 +167,28 @@ module VagrantPlugins
 
             disk[:absolute_path] = storage_prefix + disk[:path]
 
-            if env[:machine].provider.driver.connection.volumes.select do |x|
-              x.name == disk[:name] && x.pool_name == @storage_pool_name
-            end.empty?
-              # make the disk. equivalent to:
-              # qemu-img create -f qcow2 <path> 5g
-              begin
-                env[:machine].provider.driver.connection.volumes.create(
-                  name: disk[:name],
-                  format_type: disk[:type],
-                  path: disk[:absolute_path],
-                  capacity: disk[:size],
-                  #:allocation => ?,
-                  pool_name: @storage_pool_name
-                )
-              rescue Fog::Errors::Error => e
+            # make the disk. equivalent to:
+            # qemu-img create -f qcow2 <path> 5g
+            begin
+              env[:machine].provider.driver.connection.volumes.create(
+                name: disk[:name],
+                format_type: disk[:type],
+                path: disk[:absolute_path],
+                capacity: disk[:size],
+                #:allocation => ?,
+                pool_name: @storage_pool_name
+              )
+            rescue Libvirt::Error => e
+              # It is hard to believe that e contains just a string
+              # and no useful error code!
+              msg = "Call to virStorageVolCreateXML failed: " +
+                    "storage volume '#{disk[:path]}' exists already"
+              if e.message == msg and disk[:allow_existing]
+                disk[:preexisting] = true
+              else
                 raise Errors::FogDomainVolumeCreateError,
                       error_message: e.message
               end
-            else
-              disk[:preexisting] = true
             end
           end
 
@@ -184,6 +198,9 @@ module VagrantPlugins
           env[:ui].info(" -- Forced UUID:       #{@uuid}") if @uuid != ''
           env[:ui].info(" -- Domain type:       #{@domain_type}")
           env[:ui].info(" -- Cpus:              #{@cpus}")
+          unless @cpuset.nil?
+            env[:ui].info(" -- Cpuset:            #{@cpuset}")
+          end
           if not @cpu_topology.empty?
             env[:ui].info(" -- CPU topology:   sockets=#{@cpu_topology[:sockets]}, cores=#{@cpu_topology[:cores]}, threads=#{@cpu_topology[:threads]}")
           end
@@ -197,9 +214,15 @@ module VagrantPlugins
             env[:ui].info(" -- Feature (HyperV):  name=#{feature[:name]}, state=#{feature[:state]}")
           end
           env[:ui].info(" -- Memory:            #{@memory_size / 1024}M")
+          unless @nodeset.nil?
+            env[:ui].info(" -- Nodeset:           #{@nodeset}")
+          end
           @memory_backing.each do |backing|
             env[:ui].info(" -- Memory Backing:    #{backing[:name]}: #{backing[:config].map { |k,v| "#{k}='#{v}'"}.join(' ')}")
           end
+          unless @shares.nil?
+            env[:ui].info(" -- Shares:            #{@shares}")
+          end
           env[:ui].info(" -- Management MAC:    #{@management_network_mac}")
           env[:ui].info(" -- Loader:            #{@loader}")
           env[:ui].info(" -- Nvram:             #{@nvram}")
@@ -255,7 +278,7 @@ module VagrantPlugins
           end
 
           @pcis.each do |pci|
-            env[:ui].info(" -- PCI passthrough:   #{pci[:bus]}:#{pci[:slot]}.#{pci[:function]}")
+            env[:ui].info(" -- PCI passthrough:   #{pci[:domain]}:#{pci[:bus]}:#{pci[:slot]}.#{pci[:function]}")
           end
 
           unless @rng[:model].nil?
@@ -305,18 +328,25 @@ module VagrantPlugins
             env[:ui].info(" -- smartcard device:  mode=#{@smartcard_dev[:mode]}, type=#{@smartcard_dev[:type]}")
           end
 
-          @qargs = config.qemu_args
-          if not @qargs.empty?
+          unless @qemu_args.empty?
             env[:ui].info(' -- Command line args: ')
-            @qargs.each do |arg|
+            @qemu_args.each do |arg|
               msg = "    -> value=#{arg[:value]}, "
               env[:ui].info(msg)
             end
           end
 
+          unless @qemu_env.empty?
+            env[:ui].info(' -- Command line environment variables: ')
+            @qemu_env.each do |env_var, env_value|
+              msg = "    -> #{env_var}=#{env_value}, "
+              env[:ui].info(msg)
+            end
+          end
+
           env[:ui].info(" -- Command line : #{@cmd_line}") unless @cmd_line.empty?
 
-          # Create libvirt domain.
+          # Create Libvirt domain.
           # Is there a way to tell fog to create new domain with already
           # existing volume? Use domain creation from template..
           begin

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

@@ -25,15 +25,15 @@ module VagrantPlugins
           @name = "#{env[:domain_name]}.img"
 
           # Verify the volume doesn't exist already.
-          domain_volume = ProviderLibvirt::Util::Collection.find_matching(
-            env[:machine].provider.driver.connection.volumes.all, @name
-          )
-          raise Errors::DomainVolumeExists if domain_volume
+          domain_volume = env[:machine].provider.driver.connection.volumes.all(
+            name: @name
+          ).first
+          raise Errors::DomainVolumeExists if domain_volume && domain_volume.id
 
           # Get path to backing image - box volume.
-          box_volume = ProviderLibvirt::Util::Collection.find_matching(
-            env[:machine].provider.driver.connection.volumes.all, env[:box_volume_name]
-          )
+          box_volume = env[:machine].provider.driver.connection.volumes.all(
+            name: env[:box_volume_name]
+          ).first
           @backing_file = box_volume.path
 
           # Virtual size of image. Take value worked out by HandleBoxImage
@@ -71,9 +71,15 @@ module VagrantPlugins
                          Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS |
                          Nokogiri::XML::Node::SaveOptions::FORMAT
             )
+            if config.snapshot_pool_name != config.storage_pool_name
+                pool_name = config.snapshot_pool_name
+            else
+                pool_name = config.storage_pool_name
+            end
+            @logger.debug "Using pool #{pool_name} for base box snapshot"
             domain_volume = env[:machine].provider.driver.connection.volumes.create(
               xml: xml,
-              pool_name: config.storage_pool_name
+              pool_name: pool_name
             )
           rescue Fog::Errors::Error => e
             raise Errors::FogDomainVolumeCreateError,

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

@@ -219,10 +219,12 @@ module VagrantPlugins
               networks_to_configure << network
             end
 
-            env[:ui].info I18n.t('vagrant.actions.vm.network.configuring')
-            env[:machine].guest.capability(
-              :configure_networks, networks_to_configure
-            )
+            unless networks_to_configure.empty?
+              env[:ui].info I18n.t('vagrant.actions.vm.network.configuring')
+              env[:machine].guest.capability(
+                :configure_networks, networks_to_configure
+              )
+            end
 
           end
         end
@@ -281,7 +283,7 @@ module VagrantPlugins
             return options[:network_name]
           end
 
-          # Get list of all (active and inactive) libvirt networks.
+          # Get list of all (active and inactive) Libvirt networks.
           available_networks = libvirt_networks(libvirt_client)
 
           return 'public' if options[:iface_type] == :public_network

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

@@ -47,9 +47,9 @@ module VagrantPlugins
               # 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
+              # 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.
+              # process than Libvirt API calls.
               @available_networks = libvirt_networks(
                 env[:machine].provider.driver.connection.client
               )

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

@@ -14,7 +14,7 @@ module VagrantPlugins
           env[:ui].info(I18n.t('vagrant_libvirt.destroy_domain'))
 
           # Must delete any snapshots before domain can be destroyed
-          # Fog libvirt currently doesn't support snapshots. Use
+          # Fog Libvirt currently doesn't support snapshots. Use
           # ruby-libvirt client directly. Note this is racy, see
           # http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotListNames
           libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(

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

@@ -54,7 +54,7 @@ module VagrantPlugins
 
             ssh_pid = redirect_port(
               @env[:machine],
-              fp[:host_ip] || 'localhost',
+              fp[:host_ip] || '*',
               fp[:host],
               fp[:guest_ip] || @env[:machine].provider.ssh_info[:host],
               fp[:guest],
@@ -97,6 +97,7 @@ module VagrantPlugins
             User=#{ssh_info[:username]}
             Port=#{ssh_info[:port]}
             UserKnownHostsFile=/dev/null
+            ExitOnForwardFailure=yes
             StrictHostKeyChecking=no
             PasswordAuthentication=no
             ForwardX11=#{ssh_info[:forward_x11] ? 'yes' : 'no'}
@@ -120,7 +121,7 @@ module VagrantPlugins
             end
           end
 
-          ssh_cmd << "ssh #{options} #{params}"
+          ssh_cmd << "ssh -n #{options} #{params}"
 
           @logger.debug "Forwarding port with `#{ssh_cmd}`"
           log_file = ssh_forward_log_file(host_ip, host_port,
@@ -210,9 +211,9 @@ module VagrantPlugins
         end
 
         def ssh_pid?(pid)
-          @logger.debug 'Checking if #{pid} is an ssh process '\
-                        'with `ps -o cmd= #{pid}`'
-          `ps -o cmd= #{pid}`.strip.chomp =~ /ssh/
+          @logger.debug "Checking if #{pid} is an ssh process "\
+                        "with `ps -o command= #{pid}`"
+          `ps -o command= #{pid}`.strip.chomp =~ /ssh/
         end
 
         def remove_ssh_pids

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

@@ -19,7 +19,7 @@ module VagrantPlugins
           begin
             env[:machine].guest.capability(:halt)
           rescue
-            @logger.info('Trying libvirt graceful shutdown.')
+            @logger.info('Trying Libvirt graceful shutdown.')
             domain.shutdown
           end
 

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

@@ -4,7 +4,6 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class HandleBoxImage
-        include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
         include VagrantPlugins::ProviderLibvirt::Util::StorageUtil
 
 
@@ -64,9 +63,10 @@ module VagrantPlugins
           # locking all subsequent actions as well.
           @@lock.synchronize do
             # Don't continue if image already exists in storage pool.
-            break if ProviderLibvirt::Util::Collection.find_matching(
-              env[:machine].provider.driver.connection.volumes.all, env[:box_volume_name]
-            )
+            box_volume = env[:machine].provider.driver.connection.volumes.all(
+              name: env[:box_volume_name]
+            ).first
+            break if box_volume && box_volume.id
 
             # Box is not available as a storage pool volume. Create and upload
             # it as a copy of local box image.
@@ -81,40 +81,22 @@ module VagrantPlugins
             message << " in storage pool #{config.storage_pool_name}."
             @logger.info(message)
 
-            if config.qemu_use_session
-              begin
-                @name = env[:box_volume_name]
-                @allocation = "#{box_image_size / 1024 / 1024}M"
-                @capacity = "#{box_virtual_size}G"
-                @format_type = box_format ? box_format : 'raw'
-
-                @storage_volume_uid = storage_uid env
-                @storage_volume_gid = storage_gid env
-
-                libvirt_client = env[:machine].provider.driver.connection.client
-                libvirt_pool = libvirt_client.lookup_storage_pool_by_name(
-                  config.storage_pool_name
-                )
-                libvirt_volume = libvirt_pool.create_volume_xml(
-                  to_xml('default_storage_volume')
-                )
-              rescue => e
-                raise Errors::CreatingVolumeError,
-                      error_message: e.message
-              end
-            else
-              begin
-                fog_volume = env[:machine].provider.driver.connection.volumes.create(
-                  name: env[:box_volume_name],
-                  allocation: "#{box_image_size / 1024 / 1024}M",
-                  capacity: "#{box_virtual_size}G",
-                  format_type: box_format,
-                  pool_name: config.storage_pool_name
-                )
-              rescue Fog::Errors::Error => e
-                raise Errors::FogCreateVolumeError,
-                      error_message: e.message
-              end
+            @storage_volume_uid = storage_uid env
+            @storage_volume_gid = storage_gid env
+
+            begin
+              fog_volume = env[:machine].provider.driver.connection.volumes.create(
+                name: env[:box_volume_name],
+                allocation: "#{box_image_size / 1024 / 1024}M",
+                capacity: "#{box_virtual_size}G",
+                format_type: box_format,
+                owner: @storage_volume_uid,
+                group: @storage_volume_gid,
+                pool_name: config.storage_pool_name
+              )
+            rescue Fog::Errors::Error => e
+              raise Errors::FogCreateVolumeError,
+                    error_message: e.message
             end
 
             # Upload box image to storage pool
@@ -132,11 +114,7 @@ module VagrantPlugins
             # storage pool.
             if env[:interrupted] || !ret
               begin
-                if config.qemu_use_session
-                  libvirt_volume.delete
-                else
-                  fog_volume.destroy
-                end
+                fog_volume.destroy
               rescue
                 nil
               end
@@ -146,22 +124,9 @@ module VagrantPlugins
           @app.call(env)
         end
 
-        def split_size_unit(text)
-          if text.kind_of? Integer
-            # if text is an integer, match will fail
-            size    = text
-            unit    = 'G'
-          else
-            matcher = text.match(/(\d+)(.+)/)
-            size    = matcher[1]
-            unit    = matcher[2]
-          end
-          [size, unit]
-        end
-
         protected
 
-        # Fog libvirt currently doesn't support uploading images to storage
+        # Fog Libvirt currently doesn't support uploading images to storage
         # pool volumes. Use ruby-libvirt client instead.
         def upload_image(image_file, pool_name, volume_name, env)
           image_size = File.size(image_file) # B

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

@@ -24,9 +24,9 @@ module VagrantPlugins
           # locking all subsequent actions as well.
           @@lock.synchronize do
             # Check for storage pool, where box image should be created
-            break if ProviderLibvirt::Util::Collection.find_matching(
-              env[:machine].provider.driver.connection.pools.all, config.storage_pool_name
-            )
+            break unless env[:machine].provider.driver.connection.pools.all(
+              name: config.storage_pool_name
+            ).empty?
 
             @logger.info("No storage pool '#{config.storage_pool_name}' is available.")
 
@@ -36,7 +36,7 @@ module VagrantPlugins
 
             @logger.info("Creating storage pool 'default'")
 
-            # Fog libvirt currently doesn't support creating pools. Use
+            # Fog Libvirt currently doesn't support creating pools. Use
             # ruby-libvirt client directly.
             begin
               @storage_pool_path = storage_pool_path(env)