vagrant-libvirt 0.0.43 → 0.3.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

@@ -31,16 +31,23 @@ module VagrantPlugins
 
           # Gather some info about domain
           @name = env[:domain_name]
+          @title = config.title
+          @description = config.description
           @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
           @numa_nodes = config.numa_nodes
           @loader = config.loader
+          @nvram = config.nvram
           @machine_type = config.machine_type
           @machine_arch = config.machine_arch
           @disk_bus = config.disk_bus
@@ -79,6 +86,7 @@ module VagrantPlugins
 
           # Storage
           @storage_pool_name = config.storage_pool_name
+          @snapshot_pool_name = config.snapshot_pool_name
           @disks = config.disks
           @cdroms = config.cdroms
 
@@ -94,6 +102,9 @@ module VagrantPlugins
           # Watchdog device
           @watchdog_dev = config.watchdog_dev
 
+          # USB controller
+          @usbctl_dev = config.usbctl_dev
+
           # USB device passthrough
           @usbs = config.usbs
 
@@ -101,6 +112,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
 
@@ -114,13 +131,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
@@ -128,13 +147,12 @@ module VagrantPlugins
           # If we have a box, take the path from the domain volume and set our storage_prefix.
           # If not, we dump the storage pool xml to get its defined path.
           # the default storage prefix is typically: /var/lib/libvirt/images/
-          if env[:machine].config.vm.box
-            storage_prefix = File.dirname(@domain_volume_path) + '/' # steal
-          else
-            storage_pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(@storage_pool_name)
-            raise Errors::NoStoragePool if storage_pool.nil?
-            xml = Nokogiri::XML(storage_pool.xml_desc)
-            storage_prefix = xml.xpath('/pool/target/path').inner_text.to_s + '/'
+          if !config.qemu_use_session
+            if env[:machine].config.vm.box
+              storage_prefix = File.dirname(@domain_volume_path) + '/' # steal
+            else
+              storage_prefix = get_disk_storage_prefix(env, @storage_pool_name)
+            end
           end
 
           @disks.each do |disk|
@@ -148,51 +166,77 @@ 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
-                raise Errors::FogDomainVolumeCreateError,
+            if not disk[:pool].nil?
+              disk_pool_name = disk[:pool]
+              @logger.debug "Overriding pool name with: #{disk_pool_name}"
+              disk_storage_prefix = get_disk_storage_prefix(env, disk_pool_name)
+              disk[:absolute_path] = disk_storage_prefix + disk[:path]
+              @logger.debug "Overriding disk path with: #{disk[:absolute_path]}"
+            else
+              disk_pool_name = @storage_pool_name
+            end
+
+            # 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: disk_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::FogCreateDomainVolumeError,
                       error_message: e.message
               end
-            else
-              disk[:preexisting] = true
             end
           end
 
           # Output the settings we're going to use to the user
           env[:ui].info(I18n.t('vagrant_libvirt.creating_domain'))
           env[:ui].info(" -- Name:              #{@name}")
+          env[:ui].info(" -- Title:             #{@title}") if @title != ''
+          env[:ui].info(" -- Description:       #{@description}") if @description != ''
           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
-          env[:ui].info("")
           @cpu_features.each do |cpu_feature|
             env[:ui].info(" -- CPU Feature:       name=#{cpu_feature[:name]}, policy=#{cpu_feature[:policy]}")
           end
           @features.each do |feature|
             env[:ui].info(" -- Feature:           #{feature}")
           end
+          @features_hyperv.each do |feature|
+            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}")
           if env[:machine].config.vm.box
             env[:ui].info(" -- Base box:          #{env[:machine].box.name}")
           end
@@ -245,7 +289,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?
@@ -256,6 +300,12 @@ module VagrantPlugins
             env[:ui].info(" -- Watchdog device:   model=#{@watchdog_dev[:model]}, action=#{@watchdog_dev[:action]}")
           end
 
+          if not @usbctl_dev.empty?
+            msg = " -- USB controller:    model=#{@usbctl_dev[:model]}"
+            msg += ", ports=#{@usbctl_dev[:ports]}" if @usbctl_dev[:ports]
+            env[:ui].info(msg)
+          end
+
           @usbs.each do |usb|
             usb_dev = []
             usb_dev.push("bus=#{usb[:bus]}") if usb[:bus]
@@ -289,18 +339,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
@@ -316,6 +373,14 @@ module VagrantPlugins
 
           @app.call(env)
         end
+
+        private
+        def get_disk_storage_prefix(env, disk_pool_name)
+          disk_storage_pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(disk_pool_name)
+          raise Errors::NoStoragePool if disk_storage_pool.nil?
+          xml = Nokogiri::XML(disk_storage_pool.xml_desc)
+          disk_storage_prefix = xml.xpath('/pool/target/path').inner_text.to_s + '/'
+        end
       end
     end
   end

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

@@ -8,6 +8,7 @@ module VagrantPlugins
       # image as new domain volume.
       class CreateDomainVolume
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::StorageUtil
 
         def initialize(app, _env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::create_domain_volume')
@@ -24,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
@@ -48,9 +49,8 @@ module VagrantPlugins
                 xml.target do
                   xml.format(type: 'qcow2')
                   xml.permissions do
-                    xml.owner 0
-                    xml.group 0
-                    xml.mode '0600'
+                    xml.owner storage_uid(env)
+                    xml.group storage_gid(env)
                     xml.label 'virt_image_t'
                   end
                 end
@@ -58,9 +58,8 @@ module VagrantPlugins
                   xml.path(@backing_file)
                   xml.format(type: 'qcow2')
                   xml.permissions do
-                    xml.owner 0
-                    xml.group 0
-                    xml.mode '0600'
+                    xml.owner storage_uid(env)
+                    xml.group storage_gid(env)
                     xml.label 'virt_image_t'
                   end
                 end
@@ -70,9 +69,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

@@ -80,6 +80,8 @@ module VagrantPlugins
             @pci_bus = iface_configuration.fetch(:bus, nil)
             @pci_slot = iface_configuration.fetch(:slot, nil)
             template_name = 'interface'
+            @type = nil
+            @udp_tunnel = nil
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network
               @device = iface_configuration.fetch(:dev, 'eth0')
@@ -93,6 +95,7 @@ module VagrantPlugins
               template_name = 'public_interface'
               @logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
               @ovs = iface_configuration.fetch(:ovs, false)
+              @ovs_interfaceid = iface_configuration.fetch(:ovs_interfaceid, false)
               @trust_guest_rx_filters = iface_configuration.fetch(:trust_guest_rx_filters, false)
             # configuration for udp or tcp tunnel interfaces (p2p conn btwn guest OSes)
             elsif iface_configuration.fetch(:tunnel_type, nil)
@@ -217,10 +220,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
@@ -279,7 +284,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

@@ -27,6 +27,11 @@ module VagrantPlugins
         end
 
         def call(env)
+          if env[:machine].provider_config.qemu_use_session
+            @app.call(env)
+            return
+          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
@@ -42,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/destroy_networks.rb

@@ -13,6 +13,11 @@ module VagrantPlugins
         end
 
         def call(env)
+          if env[:machine].provider_config.qemu_use_session
+            @app.call(env)
+            return
+          end
+
           # If there were some networks created for this machine, in machines
           # data directory, created_networks file holds UUIDs of each network.
           created_networks_file = env[:machine].data_dir + 'created_networks'

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,8 @@ module VagrantPlugins
             User=#{ssh_info[:username]}
             Port=#{ssh_info[:port]}
             UserKnownHostsFile=/dev/null
+            ExitOnForwardFailure=yes
+            ControlMaster=no
             StrictHostKeyChecking=no
             PasswordAuthentication=no
             ForwardX11=#{ssh_info[:forward_x11] ? 'yes' : 'no'}
@@ -108,7 +110,7 @@ module VagrantPlugins
           options += " -o ProxyCommand=\"#{ssh_info[:proxy_command]}\"" if machine.provider_config.connect_via_ssh
 
           # TODO: instead of this, try and lock and get the stdin from spawn...
-          ssh_cmd = 'exec '
+          ssh_cmd = ''
           if host_port <= 1024
             @@lock.synchronize do
               # TODO: add i18n
@@ -120,13 +122,13 @@ 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,
                                           guest_ip, guest_port)
           @logger.info "Logging to #{log_file}"
-          spawn(ssh_cmd, [:out, :err] => [log_file, 'w'])
+          spawn(ssh_cmd, [:out, :err] => [log_file, 'w'], :pgroup => true)
         end
 
         def ssh_forward_log_file(host_ip, host_port, guest_ip, guest_port)
@@ -210,9 +212,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