vagrant-libvirt 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 82c6474c93d131d101b39a936190bb3d1960677f
-  data.tar.gz: d0b5838d5d61de80c6b527b777307b8ac69eece0
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWQxNDI3NzdkZmM1ZTBlNjZjOWQyODk4MmU1Mjk3YzEwOWNjYjhkOQ==
+  data.tar.gz: !binary |-
+    NGEzYjM1YTYyZjE1ZGUxNDlhYzIzMDZhMDRjN2VhNjFlN2FjZjA5Yg==
 SHA512:
-  metadata.gz: 6193dfa786543be1441b66f51bc52a6b2629157c21d13377396e1d9995935f7dd34b57f3df0972112acaa019ad5e233034c5dc0bcccc66dbbed8d013bf68a077
-  data.tar.gz: 4b4beb87324784af102729adee0ba923746c601b1046ae286b800403f450a862d8a14a528f428eeb5775984465e047c0d8ce6125b6c19e5082f5d102052f4404
+  metadata.gz: !binary |-
+    Nzc4ZTMyODA1ZmFjNjNiZTU5ODU1MzBlN2FiODQ2YmFmMDRmMTViN2VjY2Vl
+    NTNjZDkxYTE0NjdjOGNhMWIxNjUxN2Y5YzQ0MzZmN2I0ZThmMTVkMTNmNTI2
+    YzgyOTQ3ZWVkYTNiZjhiYTVlMzVjMjI0NDA2NmZkMWQ5MDQ5MTY=
+  data.tar.gz: !binary |-
+    NmYzNWExNWI2NjdkNGM4ZjliMTc4YzFmOWU0N2UyYjY0YjkyZGRlN2EzYmMw
+    NGI5Yjk4NjY5YTVhYzQ2NjhlYmNhYzhiZmQwMGE5ZDY2ZDc4ODNmOTAyMGQx
+    MGFlNjE4ZDgxM2ZlOGIzOWU5ODZiOGI2NjAyOWVmYTJiMTU0ZWI=

data/README.md

@@ -10,7 +10,7 @@ welcome and can help a lot :-)
 ## Features
 
 * Control local Libvirt hypervisors.
-* Vagrant `up`, `destroy`, `suspend`, `resume`, `halt`, `ssh`, `reload` and `provision` commands.
+* Vagrant `up`, `destroy`, `suspend`, `resume`, `halt`, `ssh`, `reload`, `package` and `provision` commands.
 * Upload box image (qcow2 format) to Libvirt storage pool.
 * Create volume as COW diff image for domains.
 * Create private networks.
@@ -51,7 +51,14 @@ $ sudo apt-get install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev
 
 In RedHat, Centos, Fedora, ...
 ```
-# yum install libxslt-devel libxml2-devel libvirt-devel
+# yum install libxslt-devel libxml2-devel libvirt-devel libguestfs-tools-c
+```
+
+If have problem with installation - check your linker. It should be ld.gold:
+```
+sudo alternatives --set ld /usr/bin/ld.gold
+# OR
+sudo ln -fs /usr/bin/ld.gold /usr/bin/ld
 ```
 
 ## Vagrant Project Preparation
@@ -64,7 +71,7 @@ a `config.vm.provider` block. So first, add Libvirt box using any name you
 want. This is just an example of Libvirt CentOS 6.4 box available:
 
 ```
-vagrant box add centos64 http://citozin.com/fedora21.box
+vagrant box add fedora21 http://citozin.com/fedora21.box
 # or
 vagrant box add centos64 http://citozin.com/centos64.box
 ```
@@ -162,6 +169,7 @@ end
 * `keymap` - Set keymap for vm. default: en-us
 * `video_vram` - Used by some graphics card types to vary the amount of RAM dedicated to video.  Defaults to 9216.
 * `machine` - Sets machine type. Equivalent to qemu `-machine`. Use `qemu-system-x86_64 -machine help` to get a list of supported machines.
+* `machine_arch` - Sets machine architecture. This helps libvirt to determine the correct emulator type. Possible values depend on your version of qemu. For possible values, see which emulator executable `qemu-system-*` your system provides. Common examples are `aarch64`, `alpha`, `arm`, `cris`, `i386`, `lm32`, `m68k`, `microblaze`, `microblazeel`, `mips`, `mips64`, `mips64el`, `mipsel`, `moxie`, `or32`, `ppc`, `ppc64`, `ppcemb`, `s390x`, `sh4`, `sh4eb`, `sparc`, `sparc64`, `tricore`, `unicore32`, `x86_64`, `xtensa`, `xtensaeb`.
 
 
 Specific domain settings can be set for each domain separately in multi-VM
@@ -369,6 +377,13 @@ it an setting the type, e.g.
 
     config.vm.synced_folder './', '/vagrant', type: 'rsync'
 
+    or
+
+    config.vm.synced_folder './', '/vagrant', type: '9p', disabled: false, accessmode: "squash", owner: "vagrant"
+
+**SECURITY NOTE:** for remote libvirt, nfs synced folders requires a bridged public network interface and you must connect to libvirt via ssh.
+
+
 ## Customized Graphics
 
 vagrant-libvirt supports customizing the display and video settings of the
@@ -448,4 +463,3 @@ IMPORTANT NOTE: bundle is crucial. You need to use bundled vagrant.
 3. Commit your changes (`git commit -am 'Add some feature'`).
 4. Push to the branch (`git push origin my-new-feature`).
 5. Create new Pull Request.
-

data/lib/vagrant-libvirt/action.rb

@@ -31,23 +31,18 @@ module VagrantPlugins
               b2.use CreateDomain
 
               b2.use Provision
-              b2.use CreateNetworks
-              b2.use CreateNetworkInterfaces
-
               b2.use PrepareNFSValidIds
               b2.use SyncedFolderCleanup
               b2.use SyncedFolders
-
-              b2.use StartDomain
-              b2.use WaitTillUp
+              b2.use PrepareNFSSettings
+              b2.use ShareFolders
+              b2.use CreateNetworks
+              b2.use CreateNetworkInterfaces
 
               b2.use StartDomain
               b2.use WaitTillUp
 
               b2.use ForwardPorts
-
-              b2.use PrepareNFSSettings
-              b2.use ShareFolders
               b2.use SetHostname
               # b2.use SyncFolders
             else
@@ -147,8 +142,10 @@ module VagrantPlugins
 
       # not implemented and looks like not require
       def self.action_package
-        lambda do |env|
-          raise Errors::PackageNotSupported
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectLibvirt
+          b.use PackageDomain
         end
       end
 
@@ -320,6 +317,7 @@ module VagrantPlugins
 
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :ConnectLibvirt, action_root.join('connect_libvirt')
+      autoload :PackageDomain, action_root.join('package_domain')
       autoload :CreateDomain, action_root.join('create_domain')
       autoload :CreateDomainVolume, action_root.join('create_domain_volume')
       autoload :CreateNetworkInterfaces, action_root.join('create_network_interfaces')

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

@@ -34,6 +34,7 @@ module VagrantPlugins
           @cpus = config.cpus.to_i
           @cpu_mode = config.cpu_mode
           @machine_type = config.machine_type
+          @machine_arch = config.machine_arch
           @disk_bus = config.disk_bus
           @nested = config.nested
           @memory_size = config.memory.to_i * 1024

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

@@ -4,7 +4,7 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class DestroyDomain
-        def initialize(app, env)
+        def initialize(app, _env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::destroy_domain')
           @app = app
         end
@@ -17,7 +17,8 @@ module VagrantPlugins
           # 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[:libvirt_compute].client.lookup_domain_by_uuid(env[:machine].id)
+          libvirt_domain =  env[:libvirt_compute].client.lookup_domain_by_uuid(
+                              env[:machine].id)
           libvirt_domain.list_snapshots.each do |name|
             @logger.info("Deleting snapshot '#{name}'")
             begin
@@ -36,14 +37,30 @@ module VagrantPlugins
             domain.destroy(destroy_volumes: false)
 
             env[:machine].provider_config.disks.each do |disk|
-              next if disk[:allow_existing] # shared disks remove only manualy or ???
-              diskname = libvirt_domain.name + "-" + disk[:device] + ".raw"
+              # shared disks remove only manualy or ???
+              next if disk[:allow_existing]
+              diskname = libvirt_domain.name + '-' + disk[:device] + '.' + disk[:type].to_s
               # diskname is uniq
-              env[:libvirt_compute].volumes.all.select{|x| x.name == diskname }.first.destroy
+              libvirt_disk = domain.volumes.select do |x|
+                x.name == diskname
+              end.first
+              if libvirt_disk
+                libvirt_disk.destroy
+              elsif disk[:path]
+                poolname = env[:machine].provider_config.storage_pool_name
+                libvirt_disk = domain.volumes.select do |x|
+                  # FIXME can remove pool/target.img and pool/123/target.img
+                  x.path =~ /\/#{disk[:path]}$/ && x.pool_name == poolname
+                end.first
+                libvirt_disk.destroy if libvirt_disk
+              end
             end
 
-            #remove root storage
-            env[:libvirt_compute].volumes.all.select{|x| x.name == libvirt_domain.name + ".img" }.first.destroy
+            # remove root storage
+            root_disk = domain.volumes.select do |x|
+              x.name == libvirt_domain.name + '.img'
+            end.first
+            root_disk.destroy if root_disk
           end
 
           @app.call(env)

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

@@ -0,0 +1,83 @@
+require 'log4r'
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      # Action for create new box for libvirt provider
+      class PackageDomain
+        def initialize(app, env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::package_domain')
+          @app = app
+          env['package.files'] ||= {}
+          env['package.output'] ||= 'package.box'
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t('vagrant_libvirt.package_domain'))
+          libvirt_domain =  env[:libvirt_compute].client.lookup_domain_by_uuid(
+                              env[:machine].id)
+          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          root_disk = domain.volumes.select do |x|
+            x.name == libvirt_domain.name + '.img'
+          end.first
+          boxname = env['package.output']
+          raise "#{boxname}: Already exists" if File.exists?(boxname)
+          @tmp_dir = Dir.pwd + '/_tmp_package'
+          @tmp_img = @tmp_dir + '/box.img'
+          Dir.mkdir(@tmp_dir)
+          if File.readable?(root_disk.path)
+            backing = `qemu-img info "#{root_disk.path}" | grep 'backing file:' | cut -d ':' -f2`.chomp
+          else
+            env[:ui].error("Require set read access to #{root_disk.path}. sudo chmod a+r #{root_disk.path}")
+            FileUtils.rm_rf(@tmp_dir)
+            raise 'Have no access'
+          end
+          env[:ui].info('Image has backing image, copying image and rebasing ...')
+          FileUtils.cp(root_disk.path, @tmp_img)
+          `qemu-img rebase -p -b "" #{@tmp_img}`
+          # remove hw association with interface
+          # working for centos with lvs default disks
+          `virt-sysprep --no-logfile  -a #{@tmp_img} `
+          Dir.chdir(@tmp_dir)
+          img_size = `qemu-img info #{@tmp_img} | grep 'virtual size' | awk '{print $3;}' | tr -d 'G'`.chomp
+          File.write(@tmp_dir + '/metadata.json', metadata_content(img_size))
+          File.write(@tmp_dir + '/Vagrantfile',vagrantfile_content)
+          assebmle_box(boxname)
+          FileUtils.mv(@tmp_dir + '/' + boxname, '../' + boxname)
+          FileUtils.rm_rf(@tmp_dir)
+          env[:ui].info('Box created')
+          env[:ui].info('You can now add the box:')
+          env[:ui].info("vagrant box add #{boxname} --name any_comfortable_name")
+          @app.call(env)
+        end
+
+        def assebmle_box(boxname)
+          `tar cvzf "#{boxname}" --totals ./metadata.json ./Vagrantfile ./box.img`
+        end
+
+        def vagrantfile_content
+          <<-EOF
+            Vagrant.configure("2") do |config|
+              config.vm.provider :libvirt do |libvirt|
+                libvirt.driver = "kvm"
+                libvirt.host = ""
+                libvirt.connect_via_ssh = false
+                libvirt.storage_pool_name = "default"
+              end
+            end
+          EOF
+        end
+
+        def metadata_content(filesize)
+          <<-EOF
+            {
+              "provider": "libvirt",
+              "format": "qcow2",
+              "virtual_size": #{filesize}
+            }
+          EOF
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,13 @@
 require 'nokogiri'
+require 'socket'
+require 'timeout'
+
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PrepareNFSSettings
         include Vagrant::Action::Builtin::MixinSyncedFolders
-        
+
         def initialize(app,env)
           @app = app
           @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
@@ -16,8 +19,8 @@ module VagrantPlugins
 
           if using_nfs?
             @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
-            env[:nfs_host_ip]    = read_host_ip(env[:machine],env)
-            env[:nfs_machine_ip] = env[:machine].ssh_info[:host]
+            env[:nfs_host_ip]    = read_host_ip(env[:machine])
+            env[:nfs_machine_ip] = read_machine_ip(env[:machine])
 
             @logger.info("host IP: #{env[:nfs_host_ip]} machine IP: #{env[:nfs_machine_ip]}")
 
@@ -32,37 +35,54 @@ module VagrantPlugins
           !!synced_folders(@machine)[:nfs]
         end
 
-        # Returns the IP address of the first host only network adapter
+        # Returns the IP address of the host
         #
         # @param [Machine] machine
         # @return [String]
-        def read_host_ip(machine,env)
-          nets = env[:libvirt_compute].list_networks
-          if nets.size == 1
-            net = nets.first
-          else
-            domain = env[:libvirt_compute].servers.get(machine.id.to_s)
-            xml=Nokogiri::XML(domain.to_xml)
-            networkname = xml.xpath('/domain/devices/interface/source').first.attributes['network'].value.to_s
-            @logger.info("Using network named #{networkname}")
-            net = env[:libvirt_compute].list_networks.find {|netw| netw[:name] == networkname}
+        def read_host_ip(machine)
+          UDPSocket.open do |s|
+            s.connect(machine.ssh_info[:host], 1)
+            s.addr.last
           end
-          # FIXME better implement by libvirt xml parsing
-          `ip addr show | grep -A 2 #{net[:bridge_name]} | grep -i 'inet ' | tr -s ' ' | cut -d' ' -f3 | cut -d'/' -f 1`.chomp
         end
 
-        # Returns the IP address of the guest by looking at the first
-        # enabled host only network.
+        # Returns the IP address of the guest
         #
+        # @param [Machine] machine
         # @return [String]
         def read_machine_ip(machine)
-          machine.config.vm.networks.each do |type, options|
-            if type == :private_network && options[:ip].is_a?(String)
-              return options[:ip]
-            end
+          # check host only ip
+          ssh_host = machine.ssh_info[:host]
+          return ssh_host if ping(ssh_host)
+
+          # check other ips
+          command = "ip addr show | grep -i 'inet ' | grep -v '127.0.0.1' | tr -s ' ' | cut -d' ' -f3 | cut -d'/' -f 1"
+          result  = ""
+          machine.communicate.execute(command) do |type, data|
+            result << data if type == :stdout
           end
 
-          nil
+          ips = result.chomp.split("\n")
+          @logger.info("guest IPs: #{ips.join(', ')}")
+          ips.each do |ip|
+            next if ip == ssh_host
+            return ip if ping(ip)
+          end
+        end
+
+        private
+
+        # Check if we can open a connection to the host
+        def ping(host, timeout = 3)
+          timeout(timeout) do
+            s = TCPSocket.new(host, 'echo')
+            s.close
+          end
+          true
+        rescue Errno::ECONNREFUSED
+          true
+        rescue Timeout::Error, StandardError
+          false
         end
       end
     end

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

@@ -48,8 +48,8 @@ module VagrantPlugins
             :forward_agent => machine.config.ssh.forward_agent,
             :forward_x11   => machine.config.ssh.forward_x11,
           }
-          
-          ssh_info[:proxy_command] = "ssh '#{machine.provider_config.host}' -l '#{machine.provider_config.username}' nc %h %p" if machine.provider_config.connect_via_ssh
+
+          ssh_info[:proxy_command] = "ssh '#{machine.provider_config.host}' -l '#{machine.provider_config.username}' -i '#{machine.provider_config.id_ssh_key_file}' nc %h %p" if machine.provider_config.connect_via_ssh
 
           ssh_info
         end

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

@@ -1,74 +1,65 @@
-require "log4r"
+require 'log4r'
 require 'ostruct'
 require 'nokogiri'
 
-
-require "vagrant/util/subprocess"
-require "vagrant/errors"
-require "vagrant-libvirt/errors"
+require 'vagrant/util/subprocess'
+require 'vagrant/errors'
+require 'vagrant-libvirt/errors'
 # require_relative "helper"
 
 module VagrantPlugins
   module SyncedFolder9p
-    class SyncedFolder < Vagrant.plugin("2", :synced_folder)
+    class SyncedFolder < Vagrant.plugin('2', :synced_folder)
       include Vagrant::Util
       include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
       def initialize(*args)
         super
-
-        @logger = Log4r::Logger.new("vagrant_libvirt::synced_folders::9p")
+        @logger = Log4r::Logger.new('vagrant_libvirt::synced_folders::9p')
       end
 
-      def usable?(machine, raise_error=false)
+      def usable?(machine, raise_error = false)
         # bail now if not using libvirt since checking version would throw error
         return false unless machine.provider_name == :libvirt
 
         # <filesystem/> support in device attach/detach introduced in 1.2.2
         # version number format is major * 1,000,000 + minor * 1,000 + release
         libvirt_version = ProviderLibvirt.libvirt_connection.client.libversion
-        if libvirt_version >= 1002002
-          return true
-        else
-          return false
-        end
+        libvirt_version >= 1_002_002
       end
 
-      def prepare(machine, folders, opts)
-        
-        raise Vagrant::Errors::Error("No libvirt connection") if ProviderLibvirt.libvirt_connection.nil?
-      
+      def prepare(machine, folders, _opts)
+        raise Vagrant::Errors::Error('No libvirt connection') if ProviderLibvirt.libvirt_connection.nil?
         @conn = ProviderLibvirt.libvirt_connection.client
 
         begin
           # loop through folders
           folders.each do |id, folder_opts|
-            folder_opts.merge!({ :accessmode => "passthrough",
-                                 :readonly => nil }) { |_k, ov, _nv| ov }
+            folder_opts.merge!({  target: id,
+                                  accessmode: 'passthrough',
+                                  readonly: nil }) { |_k, ov, _nv| ov }
             machine.ui.info "================\nMachine id: #{machine.id}\nShould be mounting folders\n #{id}, opts: #{folder_opts}"
-
-            xml =  to_xml('filesystem', folder_opts )
+            xml =  to_xml('filesystem', folder_opts)
             # puts "<<<<< XML:\n #{xml}\n >>>>>"
             @conn.lookup_domain_by_uuid(machine.id).attach_device(xml, 0)
-
-          end 
+          end
         rescue => e
           machine.ui.error("could not attach device because: #{e}")
-          raise VagrantPlugins::ProviderLibvirt::Errors::AttachDeviceError,:error_message => e.message
+          raise VagrantPlugins::ProviderLibvirt::Errors::AttachDeviceError,
+            error_message: e.message
         end
       end
 
-
       # TODO once up, mount folders
       def enable(machine, folders, _opts)
         # Go through each folder and mount
-        machine.ui.info("mounting p9 share in guest")
+        machine.ui.info('mounting p9 share in guest')
         # 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 }
+          mount_folders[id].merge!(version: '9p2000.L') { |_k, ov, _nv| ov }
         end
         # Mount the actual folder
         machine.guest.capability(
@@ -76,27 +67,25 @@ module VagrantPlugins
       end
 
       def cleanup(machine, _opts)
-
-        raise Vagrant::Errors::Error("No libvirt connection") if ProviderLibvirt.libvirt_connection.nil?
-
+        if ProviderLibvirt.libvirt_connection.nil?
+          raise Vagrant::Errors::Error('No libvirt connection')
+        end
         @conn = ProviderLibvirt.libvirt_connection.client
- 
         begin
-          if machine.id && machine.id != ""
+          if machine.id && machine.id != ''
             dom = @conn.lookup_domain_by_uuid(machine.id)
-            Nokogiri::XML(dom.xml_desc).xpath('/domain/devices/filesystem').each do |xml|
+            Nokogiri::XML(dom.xml_desc).xpath(
+              '/domain/devices/filesystem').each do |xml|
               dom.detach_device(xml.to_s)
-
-              machine.ui.info "Cleaned up shared folders"
+              machine.ui.info 'Cleaned up shared folders'
             end
           end
         rescue => e
           machine.ui.error("could not detach device because: #{e}")
-          raise VagrantPlugins::ProviderLibvirt::Errors::DetachDeviceError,:error_message => e.message
+          raise VagrantPlugins::ProviderLibvirt::Errors::DetachDeviceError,
+                error_message: e.message
         end
-
       end
-
     end
   end
 end

data/lib/vagrant-libvirt/config.rb

@@ -56,6 +56,7 @@ module VagrantPlugins
       attr_accessor :cpus
       attr_accessor :cpu_mode
       attr_accessor :machine_type
+      attr_accessor :machine_arch
       attr_accessor :disk_bus
       attr_accessor :nic_model_type
       attr_accessor :nested
@@ -95,6 +96,7 @@ module VagrantPlugins
         @cpus              = UNSET_VALUE
         @cpu_mode          = UNSET_VALUE
         @machine_type      = UNSET_VALUE
+        @machine_arch      = UNSET_VALUE
         @disk_bus          = UNSET_VALUE
         @nic_model_type    = UNSET_VALUE
         @nested            = UNSET_VALUE
@@ -248,7 +250,7 @@ module VagrantPlugins
           # set ssh key for access to libvirt host
           uri << "\&keyfile="
           # if no slash, prepend $HOME/.ssh/
-          uri << "#{`echo ${HOME}`.chomp}/.ssh/" if @id_ssh_key_file !~ /\A\//
+          @id_ssh_key_file.prepend("#{`echo ${HOME}`.chomp}/.ssh/") if @id_ssh_key_file !~ /\A\//
           uri << @id_ssh_key_file
         end
         # set path to libvirt socket
@@ -277,6 +279,7 @@ module VagrantPlugins
         @cpus = 1 if @cpus == UNSET_VALUE
         @cpu_mode = 'host-model' if @cpu_mode == UNSET_VALUE
         @machine_type = nil if @machine_type == UNSET_VALUE
+        @machine_arch = nil if @machine_arch == UNSET_VALUE
         @disk_bus = 'virtio' if @disk_bus == UNSET_VALUE
         @nic_model_type = 'virtio' if @nic_model_type == UNSET_VALUE
         @nested = false if @nested == UNSET_VALUE

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

@@ -14,11 +14,19 @@
   <% end %>
 
   <os>
-  <% if @machine_type %>
-    <type machine='<%= @machine_type %>'>hvm</type>
-  <% else %>
-    <type>hvm</type>
-  <% end %>
+    <% if @machine_type %>
+      <% if @machine_arch %>
+        <type arch='<%= @machine_arch %>' machine='<%= @machine_type %>'>hvm</type>
+      <% else %>
+        <type machine='<%= @machine_type %>'>hvm</type>
+      <% end %>
+    <% else %>
+      <% if @machine_arch %>
+        <type arch='<%= @machine_arch %>'>hvm</type>
+      <% else %>
+        <type>hvm</type>
+      <% end %>
+    <% end %>
     <boot dev='hd'/>
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>

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

@@ -1,8 +1,8 @@
     <filesystem type='mount' accessmode='<%= accessmode %>'>
       <driver type='path' wrpolicy='immediate'/>
       <source dir='<%= hostpath %>'/>
-      <target dir='<%= guestpath %>'/>
+      <target dir='<%= target %>'/>
       <% unless readonly.nil? %>
          <readonly /> 
       <% end %>
-    </filesystem>
+    </filesystem>

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.28'
+    VERSION = '0.0.29'
   end
 end

data/tools/create_box.sh

@@ -60,7 +60,7 @@ TMP_IMG="$TMP_DIR/box.img"
 
 mkdir -p "$TMP_DIR"
 
-[[ ! -w "$IMG" ]] && error "'$IMG': Permission denied"
+[[ ! -r "$IMG" ]] && error "'$IMG': Permission denied"
 
 # We move / copy (when the image has master) the image to the tempdir
 # ensure that it's moved back / removed again

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: libvirt provider for Vagrant.
@@ -105,7 +105,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -134,6 +134,7 @@ files:
 - lib/vagrant-libvirt/action/message_not_created.rb
 - lib/vagrant-libvirt/action/message_not_running.rb
 - lib/vagrant-libvirt/action/message_not_suspended.rb
+- lib/vagrant-libvirt/action/package_domain.rb
 - lib/vagrant-libvirt/action/prepare_nfs_settings.rb
 - lib/vagrant-libvirt/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-libvirt/action/prune_nfs_exports.rb
@@ -185,12 +186,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []