vagrant-libvirt 0.9.0 → 0.10.0

data/lib/vagrant-libvirt/config.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
   module ProviderLibvirt
     class Config < Vagrant.plugin('2', :config)
       # manually specify URI
-      # will supercede most other options if provided
+      # will supersede most other options if provided
       attr_accessor :uri
 
       # A hypervisor name to access via Libvirt.
@@ -99,6 +99,7 @@ module VagrantPlugins
       attr_accessor :machine_virtual_size
       attr_accessor :disk_bus
       attr_accessor :disk_device
+      attr_accessor :disk_controller_model
       attr_accessor :disk_driver_opts
       attr_accessor :nic_model_type
       attr_accessor :nested
@@ -128,6 +129,9 @@ module VagrantPlugins
       attr_accessor :tpm_path
       attr_accessor :tpm_version
 
+      # Configure sysinfo values
+      attr_accessor :sysinfo
+
       # Configure the memballoon
       attr_accessor :memballoon_enabled
       attr_accessor :memballoon_model
@@ -195,6 +199,9 @@ module VagrantPlugins
       # serial consoles
       attr_accessor :serials
 
+      # internal helper attributes
+      attr_accessor :host_device_exclude_prefixes
+
       def initialize
         @uri               = UNSET_VALUE
         @driver            = UNSET_VALUE
@@ -253,6 +260,7 @@ module VagrantPlugins
         @machine_virtual_size = UNSET_VALUE
         @disk_bus          = UNSET_VALUE
         @disk_device       = UNSET_VALUE
+        @disk_controller_model = UNSET_VALUE
         @disk_driver_opts  = {}
         @nic_model_type    = UNSET_VALUE
         @nested            = UNSET_VALUE
@@ -280,6 +288,8 @@ module VagrantPlugins
         @tpm_path          = UNSET_VALUE
         @tpm_version       = UNSET_VALUE
 
+        @sysinfo           = UNSET_VALUE
+
         @memballoon_enabled = UNSET_VALUE
         @memballoon_model   = UNSET_VALUE
         @memballoon_pci_bus = UNSET_VALUE
@@ -342,6 +352,9 @@ module VagrantPlugins
         @qemu_use_agent  = UNSET_VALUE
 
         @serials           = UNSET_VALUE
+
+        # internal options to help override behaviour
+        @host_device_exclude_prefixes = UNSET_VALUE
       end
 
       def boot(device)
@@ -865,8 +878,15 @@ module VagrantPlugins
         @machine_type = nil if @machine_type == UNSET_VALUE
         @machine_arch = nil if @machine_arch == UNSET_VALUE
         @machine_virtual_size = nil if @machine_virtual_size == UNSET_VALUE
-        @disk_bus = 'virtio' if @disk_bus == UNSET_VALUE
-        @disk_device = 'vda' if @disk_device == UNSET_VALUE
+        @disk_device = @disk_bus == 'scsi' ? 'sda' : 'vda' if @disk_device == UNSET_VALUE
+        @disk_bus = @disk_device.start_with?('sd') ? 'scsi' : 'virtio' if @disk_bus == UNSET_VALUE
+        if @disk_controller_model == UNSET_VALUE
+          if @disk_bus == 'scsi' or @disk_device.start_with?('sd') == 'sd'
+            @disk_controller_model = 'virtio-scsi'
+          else
+            @disk_controller_model = nil
+          end
+        end
         @disk_driver_opts = {} if @disk_driver_opts == UNSET_VALUE
         @nic_model_type = nil if @nic_model_type == UNSET_VALUE
         @nested = false if @nested == UNSET_VALUE
@@ -902,6 +922,8 @@ module VagrantPlugins
         @nic_adapter_count = 8 if @nic_adapter_count == UNSET_VALUE
         @emulator_path = nil if @emulator_path == UNSET_VALUE
 
+        @sysinfo = {} if @sysinfo == UNSET_VALUE
+
         # Boot order
         @boot_order = [] if @boot_order == UNSET_VALUE
 
@@ -972,6 +994,8 @@ module VagrantPlugins
         @qemu_use_agent = false if @qemu_use_agent == UNSET_VALUE
 
         @serials = [{:type => 'pty', :source => nil}] if @serials == UNSET_VALUE
+
+        @host_device_exclude_prefixes = ['docker', 'macvtap', 'virbr', 'vnet'] if @host_device_exclude_prefixes == UNSET_VALUE
       end
 
       def validate(machine)
@@ -999,7 +1023,7 @@ module VagrantPlugins
         end
 
         if @qemu_use_agent == true
-          # if qemu agent is used to optain domain ip configuration, at least
+          # if qemu agent is used to obtain domain ip configuration, at least
           # one qemu channel has to be configured. As there are various options,
           # error out and leave configuration to the user
           unless machine.provider_config.channels.any? { |channel| channel[:target_name].start_with?("org.qemu.guest_agent") }
@@ -1029,7 +1053,9 @@ module VagrantPlugins
           errors << "#{e}"
         end
 
-        machine.config.vm.networks.each do |_type, opts|
+        machine.config.vm.networks.each_with_index do |network, index|
+          type, opts = network
+
           if opts[:mac]
             if opts[:mac] =~ /\A([0-9a-fA-F]{12})\z/
               opts[:mac] = opts[:mac].scan(/../).join(':')
@@ -1038,6 +1064,13 @@ module VagrantPlugins
               errors << "Configured NIC MAC '#{opts[:mac]}' is not in 'xx:xx:xx:xx:xx:xx' or 'xxxxxxxxxxxx' format"
             end
           end
+
+          # only interested in public networks where portgroup is nil, as then source will be a host device
+          if type == :public_network && opts[:portgroup] == nil
+            if !host_devices.include?(opts[:dev])
+              errors << "network configuration #{index} for machine #{machine.name} is a public_network referencing host device '#{opts[:dev]}' which does not exist, consider adding ':dev => ....' referencing one of #{host_devices.join(", ")}"
+            end
+          end
         end
 
         if !machine.provider_config.volume_cache.nil? and machine.provider_config.volume_cache != UNSET_VALUE
@@ -1048,6 +1081,8 @@ module VagrantPlugins
           end
         end
 
+        errors = validate_sysinfo(machine, errors)
+
         { 'Libvirt Provider' => errors }
       end
 
@@ -1062,7 +1097,11 @@ module VagrantPlugins
           result.cdroms = c
 
           result.disk_driver_opts = disk_driver_opts.merge(other.disk_driver_opts)
-          
+
+          c = sysinfo == UNSET_VALUE ? {} : sysinfo.dup
+          c.merge!(other.sysinfo) { |_k, x, y| x.respond_to?(:each_pair) ? x.merge(y) : x + y } if other.sysinfo != UNSET_VALUE
+          result.sysinfo = c
+
           c = clock_timers.dup
           c += other.clock_timers
           result.clock_timers = c
@@ -1170,6 +1209,62 @@ module VagrantPlugins
           @proxy_command = nil
         end
       end
+
+      def host_devices
+        @host_devices ||= begin
+          require 'socket'
+
+          Socket.getifaddrs.map { |iface| iface.name }.uniq.select do |dev|
+            dev != "lo" && !@host_device_exclude_prefixes.any? { |exclude| dev.start_with?(exclude) }
+          end
+        end
+      end
+
+      def validate_sysinfo(machine, errors)
+        valid_sysinfo = {
+          'bios' => %w[vendor version date release],
+          'system' => %w[manufacturer product version serial uuid sku family],
+          'base board' => %w[manufacturer product version serial asset location],
+          'chassis' => %w[manufacturer version serial asset sku],
+          'oem strings' => nil,
+        }
+
+        machine.provider_config.sysinfo.each_pair do |block_name, entries|
+          block_name = block_name.to_s
+          unless valid_sysinfo.key?(block_name)
+            errors << "invalid sysinfo element '#{block_name}'; smbios sysinfo elements supported: #{valid_sysinfo.keys.join(', ')}"
+            next
+          end
+
+          if valid_sysinfo[block_name].nil?
+            # assume simple array of text entries
+            entries.each do |entry|
+              if entry.respond_to?(:to_str)
+                if entry.to_s.empty?
+                  machine.ui.warn("Libvirt Provider: 'sysinfo.#{block_name}' contains an empty or nil entry and will be discarded")
+                end
+              else
+                errors << "sysinfo.#{block_name} expects entries to be stringy, got #{entry.class} containing '#{entry}'"
+              end
+            end
+          else
+            entries.each_pair do |entry_name, entry_text|
+              entry_name = entry_name.to_s
+              unless valid_sysinfo[block_name].include?(entry_name)
+                errors << "'sysinfo.#{block_name}' does not support entry name '#{entry_name}'; entries supported: #{valid_sysinfo[block_name].join(', ')}"
+                next
+              end
+
+              # this allows removal of entries specified by other Vagrantfile's in the hierarchy
+              if entry_text.to_s.empty?
+                machine.ui.warn("Libvirt Provider: sysinfo.#{block_name}.#{entry_name} is nil or empty and therefore has no effect.")
+              end
+            end
+          end
+        end
+
+        errors
+      end
     end
   end
 end

data/lib/vagrant-libvirt/driver.rb

@@ -32,16 +32,17 @@ module VagrantPlugins
         config = @machine.provider_config
         uri = config.uri
 
-        conn_attr = {}
-        conn_attr[:provider] = 'libvirt'
-        conn_attr[:libvirt_uri] = uri
-        conn_attr[:libvirt_username] = config.username if config.username
-        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
         ip_command = %q( awk "/$mac/ {print \$1}" /proc/net/arp )
-        conn_attr[:libvirt_ip_command] = ip_command
+
+        conn_attr = {
+          provider: 'libvirt',
+          libvirt_uri: uri,
+          libvirt_ip_command: ip_command,
+        }
+        conn_attr[:libvirt_username] = config.username if config.username
+        conn_attr[:libvirt_password] = config.password if config.password
 
         @logger.info("Connecting to Libvirt (#{uri}) ...")
         begin
@@ -61,7 +62,7 @@ module VagrantPlugins
 
         config = @machine.provider_config
 
-        @system_connection = Libvirt::open_read_only(config.system_uri)
+        @system_connection = Libvirt.open_read_only(config.system_uri)
         @system_connection
       end
 
@@ -69,12 +70,10 @@ module VagrantPlugins
         begin
           domain = connection.servers.get(machine.id)
         rescue Libvirt::RetrieveError => e
-          if e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
-            @logger.debug("machine #{machine.name} domain not found #{e}.")
-            return nil
-          else
-            raise e
-          end
+          raise e unless e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
+
+          @logger.debug("machine #{machine.name} domain not found #{e}.")
+          return nil
         end
 
         domain
@@ -99,32 +98,82 @@ module VagrantPlugins
 
       def get_domain_ipaddress(machine, domain)
         # attempt to get ip address from qemu agent
-        if @machine.provider_config.qemu_use_agent == true
+        if machine.provider_config.qemu_use_agent == true
           @logger.info('Get IP via qemu agent')
-          return get_ipaddress_from_qemu_agent(domain, machine.id)
+          return get_ipaddress_from_qemu_agent(domain, machine.id, machine.config.vm.boot_timeout)
         end
 
-        if @machine.provider_config.qemu_use_session
-          return get_ipaddress_from_system domain.mac
-        end
+        return get_ipaddress_from_system domain.mac if machine.provider_config.qemu_use_session
 
         # Get IP address from dhcp leases table
         begin
           ip_address = get_ipaddress_from_domain(domain)
         rescue Fog::Errors::TimeoutError
-          @logger.info('Timeout at waiting for an ip address for machine %s' % machine.name)
+          @logger.info("Timeout at waiting for an ip address for machine #{machine.name}")
 
           raise
         end
 
         unless ip_address
-          @logger.info('No arp table entry found for machine %s' % machine.name)
+          @logger.info("No arp table entry found for machine #{machine.name}")
           return nil
         end
 
         ip_address
       end
 
+      def restore_snapshot(machine, snapshot_name)
+        domain = get_libvirt_domain(machine)
+        snapshot = get_snapshot_if_exists(machine, snapshot_name)
+        begin
+          # 4 is VIR_DOMAIN_SNAPSHOT_REVERT_FORCE
+          # needed due to https://bugzilla.redhat.com/show_bug.cgi?id=1006886
+          domain.revert_to_snapshot(snapshot, 4)
+        rescue Fog::Errors::Error => e
+          raise Errors::SnapshotReversionError, error_message: e.message
+        end
+      end
+
+      def list_snapshots(machine)
+        get_libvirt_domain(machine).list_snapshots
+      rescue Fog::Errors::Error => e
+        raise Errors::SnapshotListError, error_message: e.message
+      end
+
+      def delete_snapshot(machine, snapshot_name)
+        get_snapshot_if_exists(machine, snapshot_name).delete
+      rescue Errors::SnapshotMissing => e
+        raise Errors::SnapshotDeletionError, error_message: e.message
+      end
+
+      def create_new_snapshot(machine, snapshot_name)
+        snapshot_desc = <<-EOF
+        <domainsnapshot>
+          <name>#{snapshot_name}</name>
+          <description>Snapshot for vagrant sandbox</description>
+        </domainsnapshot>
+        EOF
+        get_libvirt_domain(machine).snapshot_create_xml(snapshot_desc)
+      rescue Fog::Errors::Error => e
+        raise Errors::SnapshotCreationError, error_message: e.message
+      end
+
+      def create_snapshot(machine, snapshot_name)
+        begin
+          delete_snapshot(machine, snapshot_name)
+        rescue Errors::SnapshotDeletionError
+        end
+        create_new_snapshot(machine, snapshot_name)
+      end
+
+      # if we can get snapshot description without exception it exists
+      def get_snapshot_if_exists(machine, snapshot_name)
+        snapshot = get_libvirt_domain(machine).lookup_snapshot_by_name(snapshot_name)
+        return snapshot if snapshot.xml_desc
+      rescue Libvirt::RetrieveError => e
+        raise Errors::SnapshotMissing, error_message: e.message
+      end
+
       def state(machine)
         # may be other error states with initial retreival we can't handle
         begin
@@ -149,7 +198,7 @@ module VagrantPlugins
           end
         end
 
-        return state
+        state
       end
 
       private
@@ -160,43 +209,44 @@ module VagrantPlugins
         system_connection.list_all_networks.each do |net|
           leases = net.dhcp_leases(mac, 0)
           # Assume the lease expiring last is the current IP address
-          ip_address = leases.sort_by { |lse| lse["expirytime"] }.last["ipaddr"] if !leases.empty?
+          ip_address = leases.max_by { |lse| lse['expirytime'] }['ipaddr'] unless leases.empty?
           break if ip_address
         end
 
         ip_address
       end
 
-      def get_ipaddress_from_qemu_agent(domain, machine_id)
+      def get_ipaddress_from_qemu_agent(domain, machine_id, timeout)
         ip_address = nil
         addresses = nil
         libvirt_domain = connection.client.lookup_domain_by_uuid(machine_id)
         begin
-          response = libvirt_domain.qemu_agent_command('{"execute":"guest-network-get-interfaces"}', timeout=10)
-          @logger.debug("Got Response from qemu agent")
+          response = libvirt_domain.qemu_agent_command('{"execute":"guest-network-get-interfaces"}', timeout)
+          @logger.debug('Got Response from qemu agent')
           @logger.debug(response)
           addresses = JSON.parse(response)
-        rescue => e
-          @logger.debug("Unable to receive IP via qemu agent: [%s]" % e.message)
+        rescue StandardError => e
+          puts "Unable to receive IP via qemu agent: [#{e.message}]"
+          @logger.debug("Unable to receive IP via qemu agent: [#{e.message}]")
         end
 
         unless addresses.nil?
-          addresses["return"].each{ |interface|
-            if domain.mac.downcase == interface["hardware-address"].downcase
-              @logger.debug("Found mathing interface: [%s]" % interface["name"])
-              if interface.has_key?("ip-addresses")
-                interface["ip-addresses"].each{ |ip|
-                  # returning ipv6 addresses might break windows guests because
-                  # winrm cant handle connection, winrm fails with "invalid uri"
-                  if ip["ip-address-type"] == "ipv4"
-                    ip_address = ip["ip-address"]
-                    @logger.debug("Return IP: [%s]" % ip_address)
-                    break
-                  end
-                  }
-              end
+          addresses['return'].each do |interface|
+            next unless domain.mac.downcase == interface['hardware-address'].downcase
+
+            @logger.debug("Found matching interface: [#{interface['name']}]")
+            next unless interface.key?('ip-addresses')
+
+            interface['ip-addresses'].each do |ip|
+              # returning ipv6 addresses might break windows guests because
+              # winrm can't handle connection, winrm fails with "invalid uri"
+              next unless ip['ip-address-type'] == 'ipv4'
+
+              ip_address = ip['ip-address']
+              @logger.debug("Return IP: [#{ip_address}]")
+              break
             end
-          }
+          end
         end
         ip_address
       end
@@ -204,18 +254,30 @@ module VagrantPlugins
       def get_ipaddress_from_domain(domain)
         ip_address = nil
         domain.wait_for(2) do
-          addresses.each_pair do |type, ip|
+          addresses.each_pair do |_type, ip|
             # Multiple leases are separated with a newline, return only
             # the most recent address
-            ip_address = ip[0].split("\n").first if ip[0] != nil
+            ip_address = ip[0].split("\n").first unless ip[0].nil?
           end
 
-          ip_address != nil
+          !ip_address.nil?
         end
 
         ip_address
       end
 
+      def get_libvirt_domain(machine)
+        begin
+          libvirt_domain = connection.client.lookup_domain_by_uuid(machine.id)
+        rescue Libvirt::RetrieveError => e
+          raise e unless e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
+
+          @logger.debug("machine #{machine.name} not found #{e}.")
+          return nil
+        end
+
+        libvirt_domain
+      end
     end
   end
 end

data/lib/vagrant-libvirt/errors.rb

@@ -109,7 +109,7 @@ module VagrantPlugins
       end
 
       class FogCreateServerError < VagrantLibvirtError
-        error_key(:fog_create_server_error)
+        error_key(:create_server_error)
       end
 
       # Network exceptions
@@ -154,6 +154,10 @@ module VagrantPlugins
       end
 
       # Other exceptions
+      class UpdateServerError < VagrantLibvirtError
+        error_key(:create_server_error)
+      end
+
       class InterfaceSlotNotAvailable < VagrantLibvirtError
         error_key(:interface_slot_not_available)
       end
@@ -186,8 +190,24 @@ module VagrantPlugins
         error_key(:no_ip_address_error)
       end
 
-      class DeleteSnapshotError < VagrantLibvirtError
-        error_key(:delete_snapshot_error)
+      class SnapshotMissing < VagrantLibvirtError
+        error_key(:snapshot_missing)
+      end
+
+      class SnapshotDeletionError < VagrantLibvirtError
+        error_key(:snapshot_deletion_error)
+      end
+
+      class SnapshotListError < VagrantLibvirtError
+        error_key(:snapshot_list_error)
+      end
+
+      class SnapshotCreationError < VagrantLibvirtError
+        error_key(:snapshot_creation_error)
+      end
+
+      class SnapshotReversionError < VagrantLibvirtError
+        error_key(:snapshot_reversion_error)
       end
 
       class SerialCannotCreatePathError < VagrantLibvirtError

data/lib/vagrant-libvirt/plugin.rb

@@ -6,8 +6,7 @@ rescue LoadError
   raise 'The Vagrant Libvirt plugin must be run within Vagrant.'
 end
 
-# compatibility fix to define constant not available Vagrant <1.6
-::Vagrant::MachineState::NOT_CREATED_ID ||= :not_created
+require 'vagrant-libvirt/util/compat'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -27,7 +26,7 @@ module VagrantPlugins
         Provider
       end
 
-      action_hook(:remove_libvirt_image) do |hook|
+      action_hook(*(Util::Compat.action_hook_args(:remove_libvirt_image, :box_remove))) do |hook|
         require_relative 'action'
         hook.after Vagrant::Action::Builtin::BoxRemove, Action.remove_libvirt_image
       end
@@ -51,6 +50,11 @@ module VagrantPlugins
         Cap::PublicAddress
       end
 
+      provider_capability(:libvirt, :snapshot_list) do
+        require_relative 'cap/snapshots'
+        Cap::Snapshots
+      end
+
       # lower priority than nfs or rsync
       # https://github.com/vagrant-libvirt/vagrant-libvirt/pull/170
       synced_folder('9p', 4) do

data/lib/vagrant-libvirt/provider.rb

@@ -52,7 +52,7 @@ module VagrantPlugins
         #  :username => "mitchellh",
         #  :private_key_path => "/path/to/my/key"
         # }
-        # note that modifing @machine.id or accessing @machine.state is not
+        # note that modifying @machine.id or accessing @machine.state is not
         # thread safe, so be careful to avoid these here as this method may
         # be called from other threads of execution.
         return nil if state.id != :running

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

@@ -81,8 +81,28 @@
     <cmdline><%= @cmd_line %></cmdline>
 <%- if @dtb -%>
     <dtb><%= @dtb %></dtb>
+<% end -%>
+<%- unless @sysinfo.empty? -%>
+    <smbios mode='sysinfo'/>
 <% end -%>
   </os>
+<%- unless @sysinfo.empty? -%>
+  <sysinfo type='smbios'>
+  <%- @sysinfo.each_pair do |block, values| -%>
+    <<%= @sysinfo_blocks[block.to_s][:xml] %>>
+    <%- if values.respond_to?(:each_pair) -%>
+      <%- values.each do |name, value| -%>
+      <entry name='<%= name %>'><%= value %></entry>
+      <% end -%>
+    <%- else -%>
+      <%- values.each do |value| -%>
+      <entry><%= value %></entry>
+      <% end -%>
+    <% end -%>
+    </<%= @sysinfo_blocks[block.to_s][:xml] %>>
+  <% end -%>
+  </sysinfo>
+<% end -%>
   <features>
 <%- @features.each do |feature| -%>
     <<%= feature %>/>
@@ -122,6 +142,12 @@
       <target dev='<%= volume[:device] %>' bus='<%= volume[:bus] %>'/>
     </disk>
 <%- end -%>
+<%- scsi_volumes = @domain_volumes.select { |x| x[:bus] == 'scsi' } %>
+<%- if !scsi_volumes.empty? and !@disk_controller_model.nil? %>
+  <%- for idx in 0..(scsi_volumes.length / 7) do %>
+    <controller type='scsi' model='<%= @disk_controller_model %>' index='<%= idx -%>'/>
+  <%- end -%>
+<%- end -%>
 <%# additional disks -%>
 <%- @disks.each_with_index do |d, index| -%>
     <disk type='file' device='disk'>
@@ -220,7 +246,7 @@
     </graphics><% end -%>
     <video>
       <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'<% if not @video_accel3d %>/><% else %>>
-	<acceleration accel3d='yes'/>
+        <acceleration accel3d='yes'/>
       </model><% end -%>
     </video>
     <%#End Video -%>
@@ -250,13 +276,13 @@
     <hostdev mode='subsystem' type='usb'>
       <source startupPolicy='<%= usb[:startupPolicy] || "mandatory" %>'>
   <%- if usb[:vendor] -%>
-	<vendor id='<%= usb[:vendor] %>'/>
+        <vendor id='<%= usb[:vendor] %>'/>
   <%- end -%>
   <%- if usb[:product] -%>
-	<product id='<%= usb[:product] %>'/>
+        <product id='<%= usb[:product] %>'/>
   <%- end -%>
   <%- if usb[:bus] && usb[:device] -%>
-	<address bus='<%= usb[:bus] %>' device='<%= usb[:device] %>'/>
+        <address bus='<%= usb[:bus] %>' device='<%= usb[:device] %>'/>
   <%- end -%>
       </source>
     </hostdev>

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

@@ -68,4 +68,3 @@ class ByteNumber < Numeric
         (to_f/(1024 ** n)).ceil
     end
 end
-  

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'vagrant'
+
+# compatibility fix to define constant not available Vagrant <1.6
+::Vagrant::MachineState::NOT_CREATED_ID ||= :not_created
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module Compat
+        def self.action_hook_args(name, action)
+          # handle different number of arguments for action_hook depending on vagrant version
+          if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('2.2.11')
+            return name, action
+          end
+
+          return name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class String
+  def unindent
+    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
+  end
+end

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.9.0
+0.10.0