vagrant-libvirt 0.0.32 → 0.0.33

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

@@ -67,7 +67,9 @@ module VagrantPlugins
             env[:ui].info(I18n.t('vagrant_libvirt.uploading_volume'))
 
             # Create new volume in storage pool
-            raise Errors::BoxNotFound if !File.exists?(box_image_file)
+            unless File.exists?(box_image_file)
+              raise Vagrant::Errors::BoxNotFound.new(name: env[:machine].box.name)
+            end
             box_image_size = File.size(box_image_file) # B
             message = "Creating volume #{env[:box_volume_name]}"
             message << " in storage pool #{config.storage_pool_name}."

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

@@ -40,15 +40,15 @@ module VagrantPlugins
         # @param [Machine] machine
         # @return [String]
 	def read_host_ip(ip)
-      UDPSocket.open do |s|
-        if(ip.kind_of?(Array))
-            s.connect(ip.last, 1)
-        else
-            s.connect(ip, 1)
+          UDPSocket.open do |s|
+            if(ip.kind_of?(Array))
+              s.connect(ip.last, 1)
+            else
+              s.connect(ip, 1)
+            end
+            s.addr.last
+          end
         end
-        s.addr.last
-      end
-    end
         # Returns the IP address of the guest
         #
         # @param [Machine] machine
@@ -65,7 +65,7 @@ module VagrantPlugins
             result << data if type == :stdout
           end
 
-          ips = result.chomp.split("\n")
+          ips = result.chomp.split("\n").uniq
           @logger.info("guest IPs: #{ips.join(', ')}")
           ips.each do |ip|
             next if ip == ssh_host

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

@@ -46,13 +46,15 @@ module VagrantPlugins
           config = env[:machine].provider_config
           domain_name =
             if config.default_prefix.nil?
-              env[:root_path].basename.to_s.dup
+              env[:root_path].basename.to_s.dup.concat("_")
+            elsif config.default_prefix.empty?
+              # don't have any prefix, not even "_"
+              ""
             else
-              config.default_prefix.to_s
+              config.default_prefix.to_s.concat("_")
             end
-          domain_name << '_'
           domain_name << env[:machine].name.to_s
-          domain_name.gsub!(/[^-a-z0-9_]/i, '')
+          domain_name.gsub!(/[^-a-z0-9_\.]/i, '')
           domain_name << "_#{Time.now.utc.to_i}_#{SecureRandom.hex(10)}" if config.random_hostname
           domain_name
         end

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

@@ -23,8 +23,8 @@ module VagrantPlugins
 
             libvirt_domain =  env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(env[:machine].id)
 
-            if config.memory*1024 != libvirt_domain.max_memory
-              libvirt_domain.max_memory = config.memory*1024
+            if config.memory.to_i*1024 != libvirt_domain.max_memory
+              libvirt_domain.max_memory = config.memory.to_i*1024
               libvirt_domain.memory = libvirt_domain.max_memory
             end
             begin
@@ -88,7 +88,16 @@ module VagrantPlugins
                   descr_changed = true
                   cpu_model = REXML::Element.new('model', REXML::XPath.first(xml_descr,'/domain/cpu'))
                   cpu_model.attributes['fallback'] = 'allow'
-                  cpu_model.text = 'qemu64'
+                  cpu_model.text = config.cpu_model
+                else
+                  if cpu_model.text != config.cpu_model
+                    descr_changed = true
+                    cpu_model.text = config.cpu_model
+                  end
+                  if cpu_model.attributes['fallback'] != config.cpu_fallback
+                    descr_changed = true
+                    cpu_model.attributes['fallback'] = config.cpu_fallback
+                  end
                 end
                 vmx_feature = REXML::XPath.first(xml_descr,'/domain/cpu/feature[@name="vmx"]')
                 svm_feature = REXML::XPath.first(xml_descr,'/domain/cpu/feature[@name="svm"]')
@@ -126,42 +135,137 @@ module VagrantPlugins
 
               # Graphics
               graphics = REXML::XPath.first(xml_descr,'/domain/devices/graphics')
-              if graphics.attributes['type'] != config.graphics_type
-                descr_changed = true
-                graphics.attributes['type'] = config.graphics_type
-              end
-              if graphics.attributes['listen'] != config.graphics_ip
-                descr_changed = true
-                graphics.attributes['listen'] = config.graphics_ip
-                graphics.delete_element('//listen')
+              if config.graphics_type != 'none'
+                if graphics.nil? 
+                  descr_changed = true
+                  graphics = REXML::Element.new('graphics', REXML::XPath.first(xml_descr,'/domain/devices'))
+                end
+                if graphics.attributes['type'] != config.graphics_type
+                  descr_changed = true
+                  graphics.attributes['type'] = config.graphics_type
+                end
+                if graphics.attributes['listen'] != config.graphics_ip
+                  descr_changed = true
+                  graphics.attributes['listen'] = config.graphics_ip
+                  graphics.delete_element('//listen')
+                end
+                if graphics.attributes['autoport'] != config.graphics_autoport
+                  descr_changed = true
+                  graphics.attributes['autoport'] = config.graphics_autoport
+                  if config.graphics_autoport == 'no'
+                    graphics.attributes['port'] = config.graphics_port
+                  end
+                end
+                if graphics.attributes['keymap'] != config.keymap
+                  descr_changed = true
+                  graphics.attributes['keymap'] = config.keymap
+                end
+                if graphics.attributes['passwd'] != config.graphics_passwd
+                  descr_changed = true
+                  if config.graphics_passwd.nil?
+                    graphics.attributes.delete 'passwd'
+                  else
+                    graphics.attributes['passwd'] = config.graphics_passwd
+                  end
+                end
+              else 
+               # graphics_type = none, remove entire element
+               if !graphics.nil?
+                  graphics.parent.delete_element(graphics)
+               end
               end
-              if graphics.attributes['autoport'] != config.graphics_autoport
-                descr_changed = true
-                graphics.attributes['autoport'] = config.graphics_autoport
-                if config.graphics_autoport == 'no'
-                  graphics.attributes['port'] = config.graphics_port
+
+              #TPM
+              if config.tpm_path
+                raise Errors::FogCreateServerError, "The TPM Path must be fully qualified" unless config.tpm_path[0].chr == '/'
+
+                tpm = REXML::XPath.first(xml_descr,'/domain/devices/tpm')
+                if tpm.nil?
+                  descr_changed = true
+                  tpm = REXML::Element.new('tpm', REXML::XPath.first(xml_descr,'/domain/devices/tpm/model'))
+                  tpm.attributes['model'] = config.tpm_model
+                  tpm_backend_type = tpm.add_element('backend')
+                  tpm_backend_type.attributes['type'] = config.tpm_type
+                  tpm_device_path = tpm_backend_type.add_element('device')
+                  tpm_device_path.attributes['path'] = config.tpm_path
+                else
+                  if tpm.attributes['model'] != config.tpm_model
+                    descr_changed = true
+                    tpm.attributes['model'] = config.tpm_model
+                  end
+                  if tpm.elements['backend'].attributes['type'] != config.tpm_type
+                    descr_changed = true
+                    tpm.elements['backend'].attributes['type'] = config.tpm_type
+                  end
+                  if tpm.elements['backend'].elements['device'].attributes['path'] != config.tpm_path
+                    descr_changed = true
+                    tpm.elements['backend'].elements['device'].attributes['path'] = config.tpm_path
+                  end
                 end
               end
-              if graphics.attributes['keymap'] != config.keymap
+
+              # Video device
+              video = REXML::XPath.first(xml_descr,'/domain/devices/video')
+              if !video.nil? and config.graphics_type == 'none'
+                # graphics_type = none, video devices are removed since there is no possible output
                 descr_changed = true
-                graphics.attributes['keymap'] = config.keymap
+                video.parent.delete_element(video)
+              else
+                video_model = REXML::XPath.first(xml_descr,'/domain/devices/video/model')
+                if video_model.nil?
+                  video_model = REXML::Element.new('model', REXML::XPath.first(xml_descr,'/domain/devices/video'))
+                  video_model.attributes['type'] = config.video_type
+                  video_model.attributes['vram'] = config.video_vram
+                else
+                  if video_model.attributes['type'] != config.video_type || video_model.attributes['vram'] != config.video_vram
+                    descr_changed = true
+                    video_model.attributes['type'] = config.video_type
+                    video_model.attributes['vram'] = config.video_vram
+                  end
+                end
               end
-              if graphics.attributes['passwd'] != config.graphics_passwd
-                descr_changed = true
-                if config.graphics_passwd.nil?
-                  graphics.attributes.delete 'passwd'
+
+              # dtb
+              if config.dtb
+                dtb = REXML::XPath.first(xml_descr,'/domain/os/dtb')
+                if dtb.nil?
+                  descr_changed = true
+                  dtb = REXML::Element.new('dtb', REXML::XPath.first(xml_descr,'/domain/os'))
+                  dtb.text = config.dtb
                 else
-                  graphics.attributes['passwd'] = config.graphics_passwd
+                  if dtb.text != config.dtb
+                    descr_changed = true
+                    dtb.text = config.dtb
+                  end
                 end
               end
 
-              # Video device
-              video = REXML::XPath.first(xml_descr,'/domain/devices/video/model')
-              if video.attributes['type'] != config.video_type || video.attributes['vram'] != config.video_vram
-                descr_changed = true
-                video.attributes.each_attribute {|attr| video.attributes.delete attr}
-                video.attributes['type'] = config.video_type
-                video.attributes['vram'] = config.video_vram
+              # kernel and initrd
+              if config.kernel
+                kernel= REXML::XPath.first(xml_descr,'/domain/os/kernel')
+                if kernel.nil?
+                  descr_changed = true
+                  kernel = REXML::Element.new('kernel', REXML::XPath.first(xml_descr,'/domain/os'))
+                  kernel.text = config.kernel
+                else
+                  if kernel.text != config.kernel
+                    descr_changed = true
+                    kernel.text = config.kernel
+                  end
+                end
+              end
+              if config.initrd
+                initrd = REXML::XPath.first(xml_descr,'/domain/os/initrd')
+                if initrd.nil?
+                  descr_changed = true
+                  initrd = REXML::Element.new('initrd', REXML::XPath.first(xml_descr,'/domain/os'))
+                  initrd.text = config.initrd
+                else
+                  if initrd.text != config.initrd
+                    descr_changed = true
+                    initrd.text = config.initrd
+                  end
+                end
               end
 
               # Apply
@@ -179,6 +283,8 @@ module VagrantPlugins
             rescue => e
               env[:ui].error("Error when updating domain settings: #{e.message}")
             end
+            # Autostart with host if enabled in Vagrantfile
+            libvirt_domain.autostart = config.autostart
             # Actually start the domain
             domain.start
           rescue => e

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

@@ -1,4 +1,5 @@
 require 'log4r'
+require 'vagrant-libvirt/errors'
 require 'vagrant-libvirt/util/timer'
 require 'vagrant/util/retryable'
 
@@ -21,18 +22,22 @@ module VagrantPlugins
           env[:metrics] ||= {}
 
           # Get domain object
-          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
-          raise NoDomainError if domain == nil
+          domain = env[:machine].provider.driver.get_domain(env[:machine].id.to_s)
+          if domain == nil
+            raise Errors::NoDomainError,
+              :error_message => "Domain #{env[:machine].id} not found"
+          end
 
           # Wait for domain to obtain an ip address. Ip address is searched
           # from arp table, either localy or remotely via ssh, if libvirt
           # connection was done via ssh.
           env[:ip_address] = nil
           env[:metrics]["instance_ip_time"] = Util::Timer.time do
+            @logger.debug("Searching for IP for MAC address: #{domain.mac}")
             env[:ui].info(I18n.t("vagrant_libvirt.waiting_for_ip"))
             retryable(:on => Fog::Errors::TimeoutError, :tries => 300) do
               # If we're interrupted don't worry about waiting
-              next if env[:interrupted]
+              return terminate(env) if env[:interrupted]
 
               # Wait for domain to obtain an ip address
               domain.wait_for(2) {
@@ -43,7 +48,6 @@ module VagrantPlugins
               }
             end
           end
-          terminate(env) if env[:interrupted]
           @logger.info("Got IP address #{env[:ip_address]}")
           @logger.info("Time for getting IP: #{env[:metrics]["instance_ip_time"]}")
           
@@ -64,7 +68,8 @@ module VagrantPlugins
               end            
             end
           end
-          terminate(env) if env[:interrupted]
+          # if interrupted above, just terminate immediately
+          return terminate(env) if env[:interrupted]
           @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
 
           # Booted and ready for use.
@@ -76,18 +81,21 @@ module VagrantPlugins
         def recover(env)
           return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError)
 
-          if env[:machine].provider.state.id != :not_created
-            # Undo the import
-            terminate(env)
-          end
+          # Undo the import
+          terminate(env)
         end
 
         def terminate(env)
-          destroy_env = env.dup
-          destroy_env.delete(:interrupted)
-          destroy_env[:config_validate] = false
-          destroy_env[:force_confirm_destroy] = true
-          env[:action_runner].run(Action.action_destroy, destroy_env)        
+          if env[:machine].provider.state.id != :not_created
+            # If we're not supposed to destroy on error then just return
+            return if !env[:destroy_on_error]
+
+            destroy_env = env.dup
+            destroy_env.delete(:interrupted)
+            destroy_env[:config_validate] = false
+            destroy_env[:force_confirm_destroy] = true
+            env[:action_runner].run(Action.action_destroy, destroy_env)
+          end
         end
       end
     end

data/lib/vagrant-libvirt/cap/nic_mac_addresses.rb

@@ -3,7 +3,13 @@ module VagrantPlugins
     module Cap
       class NicMacAddresses
         def self.nic_mac_addresses(machine)
-          machine.provider.mac_addresses
+          # Vagrant expects a Hash with an index starting at 1 as key
+          # and the mac as uppercase string without colons as value
+          nic_macs = {}
+          machine.provider.mac_addresses.each do |index, mac|
+            nic_macs[index+1] = mac.upcase.gsub(':','')
+          end
+          nic_macs
         end
       end
     end

data/lib/vagrant-libvirt/cap/synced_folder.rb

@@ -38,6 +38,7 @@ module VagrantPlugins
           folders.each do |id, folder_opts|
             folder_opts.merge!({  target: id,
                                   accessmode: 'passthrough',
+                                  mount: true,
                                   readonly: nil }) { |_k, ov, _nv| ov }
 
             mount_tag = Digest::MD5.new.update(folder_opts[:hostpath]).to_s[0,31]
@@ -63,9 +64,11 @@ module VagrantPlugins
         # Only mount folders that have a guest path specified.
         mount_folders = {}
         folders.each do |id, opts|
-          mount_folders[id] = opts.dup if opts[:guestpath]
-          # merge common options if not given
-          mount_folders[id].merge!(version: '9p2000.L') { |_k, ov, _nv| ov }
+          if opts[:mount] && opts[:guestpath] && ! opts[:guestpath].empty?
+            mount_folders[id] = opts.dup
+            # merge common options if not given
+            mount_folders[id].merge!(version: '9p2000.L') { |_k, ov, _nv| ov }
+          end
         end
         # Mount the actual folder
         machine.guest.capability(

data/lib/vagrant-libvirt/config.rb

@@ -48,6 +48,7 @@ module VagrantPlugins
       attr_accessor :management_network_address
       attr_accessor :management_network_mode
       attr_accessor :management_network_mac
+      attr_accessor :management_network_guest_ipv6
 
       # Default host prefix (alternative to use project folder name)
       attr_accessor :default_prefix
@@ -57,6 +58,9 @@ module VagrantPlugins
       attr_accessor :memory
       attr_accessor :cpus
       attr_accessor :cpu_mode
+      attr_accessor :cpu_model
+      attr_accessor :cpu_fallback
+      attr_accessor :cpu_features
       attr_accessor :loader
       attr_accessor :boot_order
       attr_accessor :machine_type
@@ -69,6 +73,8 @@ module VagrantPlugins
       attr_accessor :kernel
       attr_accessor :cmd_line
       attr_accessor :initrd
+      attr_accessor :dtb
+      attr_accessor :emulator_path
       attr_accessor :graphics_type
       attr_accessor :graphics_autoport
       attr_accessor :graphics_port
@@ -77,6 +83,13 @@ module VagrantPlugins
       attr_accessor :video_type
       attr_accessor :video_vram
       attr_accessor :keymap
+      attr_accessor :kvm_hidden
+
+      # Sets the information for connecting to a host TPM device
+      # Only supports socket-based TPMs
+      attr_accessor :tpm_model
+      attr_accessor :tpm_type
+      attr_accessor :tpm_path
 
       # Sets the max number of NICs that can be created
       # Default set to 8. Don't change the default unless you know
@@ -90,9 +103,18 @@ module VagrantPlugins
       # Inputs
       attr_accessor :inputs
 
+      # PCI device passthrough
+      attr_accessor :pcis
+
+      # USB device passthrough
+      attr_accessor :usbs
+
       # Suspend mode
       attr_accessor :suspend_mode
 
+      # Autostart
+      attr_accessor :autostart
+
       def initialize
         @uri               = UNSET_VALUE
         @driver            = UNSET_VALUE
@@ -107,12 +129,16 @@ module VagrantPlugins
         @management_network_address = UNSET_VALUE
         @management_network_mode = UNSET_VALUE
         @management_network_mac  = UNSET_VALUE
+        @management_network_guest_ipv6  = UNSET_VALUE
 
         # Domain specific settings.
         @uuid              = UNSET_VALUE
         @memory            = UNSET_VALUE
         @cpus              = UNSET_VALUE
         @cpu_mode          = UNSET_VALUE
+        @cpu_model         = UNSET_VALUE
+        @cpu_fallback      = UNSET_VALUE
+        @cpu_features      = UNSET_VALUE
         @loader            = UNSET_VALUE
         @machine_type      = UNSET_VALUE
         @machine_arch      = UNSET_VALUE
@@ -123,7 +149,9 @@ module VagrantPlugins
         @volume_cache      = UNSET_VALUE
         @kernel            = UNSET_VALUE
         @initrd            = UNSET_VALUE
+        @dtb               = UNSET_VALUE
         @cmd_line          = UNSET_VALUE
+        @emulator_path     = UNSET_VALUE
         @graphics_type     = UNSET_VALUE
         @graphics_autoport = UNSET_VALUE
         @graphics_port     = UNSET_VALUE
@@ -132,6 +160,11 @@ module VagrantPlugins
         @video_type        = UNSET_VALUE
         @video_vram        = UNSET_VALUE
         @keymap            = UNSET_VALUE
+        @kvm_hidden        = UNSET_VALUE
+
+        @tpm_model         = UNSET_VALUE
+        @tpm_type          = UNSET_VALUE
+        @tpm_path          = UNSET_VALUE
 
         @nic_adapter_count = UNSET_VALUE
 
@@ -144,8 +177,17 @@ module VagrantPlugins
         # Inputs
         @inputs            = UNSET_VALUE
 
+        # PCI device passthrough
+        @pcis              = UNSET_VALUE
+
+        # USB device passthrough
+        @usbs              = UNSET_VALUE
+
         # Suspend mode
         @suspend_mode      = UNSET_VALUE
+
+        # Autostart
+        @autostart         = UNSET_VALUE
       end
 
       def boot(device)
@@ -183,6 +225,21 @@ module VagrantPlugins
         raise 'Only four cdroms may be attached at a time'
       end
 
+      def cpu_feature(options={})
+        if options[:name].nil? || options[:policy].nil?
+          raise 'CPU Feature name AND policy must be specified'
+        end
+
+        if @cpu_features == UNSET_VALUE
+          @cpu_features = []
+        end
+
+        @cpu_features.push({
+          name:   options[:name],
+          policy: options[:policy]
+        })
+      end
+
       def input(options={})
         if options[:type].nil? || options[:bus].nil?
           raise 'Input type AND bus must be specified'
@@ -198,6 +255,40 @@ module VagrantPlugins
         })
       end
 
+      def pci(options={})
+        if options[:bus].nil? || options[:slot].nil? || options[:function].nil?
+          raise 'Bus AND slot AND function must be specified. Check `lspci` for that numbers.'
+        end
+
+        if @pcis == UNSET_VALUE
+          @pcis = []
+        end
+
+        @pcis.push({
+          bus:       options[:bus],
+          slot:      options[:slot],
+          function:  options[:function]
+        })
+      end
+
+      def usb(options={})
+        if (options[:bus].nil? || options[:device].nil?) && options[:vendor].nil? && options[:product].nil?
+          raise 'Bus and device and/or vendor and/or product must be specified. Check `lsusb` for these.'
+        end
+
+        if @usbs == UNSET_VALUE
+          @usbs = []
+        end
+
+        @usbs.push({
+          bus:           options[:bus],
+          device:        options[:device],
+          vendor:        options[:vendor],
+          product:       options[:product],
+          startupPolicy: options[:startupPolicy],
+        })
+      end
+
       # NOTE: this will run twice for each time it's needed- keep it idempotent
       def storage(storage_type, options={})
         if storage_type == :file
@@ -320,6 +411,7 @@ module VagrantPlugins
         @management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE
         @management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE
         @management_network_mac = nil if @management_network_mac == UNSET_VALUE
+        @management_network_guest_ipv6 = 'yes' if @management_network_guest_ipv6 == UNSET_VALUE
 
         # generate a URI if none is supplied
         @uri = _generate_uri() if @uri == UNSET_VALUE
@@ -329,6 +421,9 @@ module VagrantPlugins
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
         @cpu_mode = 'host-model' if @cpu_mode == UNSET_VALUE
+        @cpu_model = 'qemu64' if @cpu_model == UNSET_VALUE
+        @cpu_fallback = 'allow' if @cpu_fallback == UNSET_VALUE
+        @cpu_features = [] if @cpu_features == UNSET_VALUE
         @loader = nil if @loader == UNSET_VALUE
         @machine_type = nil if @machine_type == UNSET_VALUE
         @machine_arch = nil if @machine_arch == UNSET_VALUE
@@ -340,6 +435,7 @@ module VagrantPlugins
         @kernel = nil if @kernel == UNSET_VALUE
         @cmd_line = '' if @cmd_line == UNSET_VALUE
         @initrd = '' if @initrd == UNSET_VALUE
+        @dtb = nil if @dtb == UNSET_VALUE
         @graphics_type = 'vnc' if @graphics_type == UNSET_VALUE
         @graphics_autoport = 'yes' if @graphics_port == UNSET_VALUE
         @graphics_autoport = 'no' if @graphics_port != UNSET_VALUE
@@ -352,7 +448,12 @@ module VagrantPlugins
         @video_type = 'cirrus' if @video_type == UNSET_VALUE
         @video_vram = 9216 if @video_vram == UNSET_VALUE
         @keymap = 'en-us' if @keymap == UNSET_VALUE
+        @kvm_hidden = false if @kvm_hidden == UNSET_VALUE
+        @tpm_model = 'tpm-tis' if @tpm_model == UNSET_VALUE
+        @tpm_type = 'passthrough' if @tpm_type == UNSET_VALUE
+        @tpm_path = nil if @tpm_path == UNSET_VALUE
         @nic_adapter_count = 8 if @nic_adapter_count == UNSET_VALUE
+        @emulator_path = nil if @emulator_path == UNSET_VALUE
 
         # Boot order
         @boot_order = [] if @boot_order == UNSET_VALUE
@@ -364,9 +465,17 @@ module VagrantPlugins
         # Inputs
         @inputs = [{:type => "mouse", :bus => "ps2"}] if @inputs == UNSET_VALUE
 
+        # PCI device passthrough
+        @pcis = [] if @pcis == UNSET_VALUE
+
+        # USB device passthrough
+        @usbs = [] if @usbs == UNSET_VALUE
+
         # Suspend mode
         @suspend_mode = "pause" if @suspend_mode == UNSET_VALUE
 
+        # Autostart
+        @autostart = false if @autostart == UNSET_VALUE
       end
 
       def validate(machine)