vagrant-libvirt 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693a19302ccb1cda6b30a7be5b5d9b8c5e74b5e3
-  data.tar.gz: 951b697e48245021c9cec5d8e392a44d7d0881ec
+  metadata.gz: e5475753167fabd89226aeb3801ae1122a07b0e9
+  data.tar.gz: 4e9db984dfcd0100c10a5e04d7a9b738a64d33ec
 SHA512:
-  metadata.gz: 8d82a8e8257f289130dfc2fc84388adbaff56803012d5a8fdfd6b12395bb100102aa452c75fb98ce1579af2ba0b961d794fe6149e02ed67e8870384ff8c5b402
-  data.tar.gz: 21f86a6f84414e3aeb92e801d5114bec30c5c0cac4a391c28142c73468c0825ae620ba527424a1fffac4970f8a75e7abe6119954c60180aef165dfc4baad8e89
+  metadata.gz: bdc9f497e2e357be510406e75e44e6638cdbd4e07830a96821c51cc698ceb21849f2216adfe829bbdc9a96396e46e0507b789b0741f8e996ea3319dbace2a418
+  data.tar.gz: 872af8fbd4e578d78a20f030a04ddf1a9aa60844f0bf6c87603b28b19c2850c5763266a47ec148d106731c15b69a08ddfd46d6a5996b5fe513a212b018e9b58e

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+# 0.0.15 (Feb 01, 2014)
+* Minimum vagrant version supported is 1.4.3
+* Add support for port forwarding (by Ryan Petrello <ryan@ryanpetrello.com>)
+* Improve network device creation (by Brian Pitts <brian@polibyte.com>)
+* Improvements to NFS sharing (by Matt Palmer and Jason DeTiberus <detiber@gmail.com>)
+* Provisioning fixes for Vagrant 1.4 (by @keitwb)
+
+# 0.0.14 (Jan. 21, 2014)
+* Vagrant 1.4 compatibility fixes (by Dmitry Vasilets <pronix.service@gmail.com>)
+* Improve how VMs IP address is discovered  (by Brian Pitts <brian@polibyte.com>)
+* Add cpu_mode parameter (by Jordan Tardif <jordan.tardi@gmail.com>)
+* Add disk_bus parameter (by Brian Pitts <brian@polibyte.com>)
+* Fixes to some error output (by Matthiew Coudron <matthieu.coudron@lip6.fr>)
+* Add parameters for booting kernel file (by Matthiew Coudron <matthieu.coudron@lip6.fr>)
+* Add default_prefix parameter (by James Shubin <purpleidea@gmail.com>)
+* Improve network creation (by Brian Pitts <brian@polibyte.com>)
+* Replace default_network parameter with management_network parameters (by Brian Pitts <brian@polibyte.com>)
+
+# 0.0.13 (Dec. 12, 2013)
+* Allow to use nested virtualization again (by Artem Chernikov <achernikov@suse.com>)
+
 # 0.0.12 (Dec. 03, 2013)
 
 * Proxy ssh through libvirt host, if libvirt is connected via ssh(by @erik-smit)

data/Gemfile

@@ -10,3 +10,7 @@ group :development do
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
 end
 
+group :plugins do
+  gem "vagrant-libvirt", :path => '.'
+end
+

data/README.md

@@ -7,9 +7,9 @@ control and provision machines via Libvirt toolkit.
 **Note:** Actual version (0.0.15) is still a development one. Feedback is
 welcome and can help a lot :-)
 
-## Features (Version 0.0.13)
+## Features
 
-* Controll local Libvirt hypervisors.
+* Control local Libvirt hypervisors.
 * Vagrant `up`, `destroy`, `suspend`, `resume`, `halt`, `ssh`, `reload` and `provision` commands.
 * Upload box image (qcow2 format) to Libvirt storage pool.
 * Create volume as COW diff image for domains.
@@ -18,9 +18,10 @@ welcome and can help a lot :-)
 * SSH into domains.
 * Setup hostname and network interfaces.
 * Provision domains with any built-in Vagrant provisioner.
-* Synced folder support via `rsync` or `nfs`.
-* Snapshots via [sahara](https://github.com/jedi4ever/sahara)
-* Use boxes from other Vagrant providers via [vagrant-mutate](https://github.com/sciurus/vagrant-mutate)
+* Synced folder support via `rsync`, `nfs` or `9p`.
+* Snapshots via [sahara](https://github.com/jedi4ever/sahara).
+* Package caching via [vagrant-cachier](http://fgrehm.viewdocs.io/vagrant-cachier/).
+* Use boxes from other Vagrant providers via [vagrant-mutate](https://github.com/sciurus/vagrant-mutate).
 
 ## Future work
 
@@ -79,11 +80,18 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.provider :libvirt do |libvirt|
-    libvirt.driver = "qemu"
+    libvirt.driver = "kvm"
     libvirt.host = "localhost"
     libvirt.connect_via_ssh = true
     libvirt.username = "root"
     libvirt.storage_pool_name = "default"
+
+    # include as many of these addition disks as you want to
+    libvirt.storage :file,
+      #:path => '',		# automatically chosen if unspecified!
+      #:device => 'vdb',	# automatically chosen if unspecified!
+      #:size => '10G',		# defaults to 10G if unspecified!
+      :type => 'qcow2'		# defaults to 'qcow2' if unspecified!
   end
 end
 ```
@@ -92,12 +100,13 @@ end
 
 This provider exposes quite a few provider-specific configuration options:
 
-* `driver` - A hypervisor name to access. For now only qemu is supported.
+* `driver` - A hypervisor name to access. For now only kvm and qemu are supported.
 * `host` - The name of the server, where libvirtd is running.
 * `connect_via_ssh` - If use ssh tunnel to connect to Libvirt.
 * `username` - Username and password to access Libvirt.
 * `password` - Password to access Libvirt.
 * `id_ssh_key_file` - The id ssh key file name to access Libvirt (eg: id_dsa or id_rsa or ... in the user .ssh directory)
+* `socket` - Path to the libvirt unix socket (eg: /var/run/libvirt/libvirt-sock)
 * `storage_pool_name` - Libvirt storage pool name, where box image and instance snapshots will be stored.
 
 ### Domain Specific Options
@@ -108,9 +117,9 @@ This provider exposes quite a few provider-specific configuration options:
 * `nested` - [Enable nested virtualization](https://github.com/torvalds/linux/blob/master/Documentation/virtual/kvm/nested-vmx.txt). Default is false.
 * `cpu_mode` - What cpu mode to use for nested virtualization. Defaults to 'host-model' if not set.
 * `volume_cache` - Controls the cache mechanism. Possible values are "default", "none", "writethrough", "writeback", "directsync" and "unsafe". [See driver->cache in libvirt documentation](http://libvirt.org/formatdomain.html#elementsDisks).
-* `kernel` - To launch the guest with a kernel residing on host filesystems (Equivalent to qemu `-kernel`)
-* `initrd` - To specify the initramfs/initrd to use for the guest (Equivalent to qemu `-initrd`)
-* `cmd_line` - Arguments passed on to the guest kernel initramfs or initrd to use (Equivalent to qemu `-append`)
+* `kernel` - To launch the guest with a kernel residing on host filesystems. Equivalent to qemu `-kernel`.
+* `initrd` - To specify the initramfs/initrd to use for the guest. Equivalent to qemu `-initrd`.
+* `cmd_line` - Arguments passed on to the guest kernel initramfs or initrd to use. Equivalent to qemu `-append`.
 
 
 Specific domain settings can be set for each domain separately in multi-VM
@@ -156,7 +165,7 @@ Vagrant goes through steps below when creating new project:
 4.	Create and start new domain on Libvirt host.
 5.	Check for DHCP lease from dnsmasq server.
 6.	Wait till SSH is available.
-7.	Sync folders via `rsync` and run Vagrant provisioner on new domain if
+7.	Sync folders and run Vagrant provisioner on new domain if
 	setup in Vagrantfile.
 
 ## Networks
@@ -228,7 +237,7 @@ starts with 'libvirt__' string. Here is a list of those options:
 * `:mac` - MAC address for the interface.
 
 ### Public Network Options
-* `:dev` - Physical device that the public interface should use. Default is 'eth0'
+* `:dev` - Physical device that the public interface should use. Default is 'eth0'.
 * `:mode` - The mode in which the public interface should operate in. Supported
   modes are available from the [libvirt documentation](http://www.libvirt.org/formatdomain.html#elementsNICSDirect).
   Default mode is 'bridge'.
@@ -279,14 +288,16 @@ will maintain an active ssh process for the lifetime of the VM.
 
 ## Synced Folders
 
-There is minimal support for synced folders. Upon `vagrant up`, the Libvirt
-provider will use `rsync` (if available) to uni-directionally sync the folder
-to the remote machine over SSH.
+vagrant-libvirt supports bidirectional synced folders via nfs or 9p and
+unidirectional via rsync. The default is nfs. Vagrant automatically syncs
+the project folder on the host to */vagrant* in the guest. You can also
+configure additional synced folders.
+
+You can change the synced folder type for */vagrant* by explicity configuring
+it an setting the type, e.g.
 
-This is good enough for all built-in Vagrant provisioners (shell,
-chef, and puppet) to work!
+    config.vm.synced_folder './', '/vagrant', type: 'rsync'
 
-If used options `:nfs => true`, folder will exported by nfs.
 
 ## Box Format
 
@@ -335,9 +346,9 @@ IMPORTANT NOTE: bundle is crucial. You need to use bundled vagrant.
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-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
+1. Fork it.
+2. Create your feature branch (`git checkout -b my-new-feature`).
+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/example_box/Vagrantfile

@@ -33,10 +33,11 @@ Vagrant.configure("2") do |config|
 
     # A hypervisor name to access. Different drivers can be specified, but
     # this version of provider creates KVM machines only. Some examples of
-    # drivers are qemu (KVM/qemu), xen (Xen hypervisor), lxc (Linux Containers),
+    # drivers are kvm (qemu hardware accelerated), qemu (qemu emulated),
+    # xen (Xen hypervisor), lxc (Linux Containers),
     # esx (VMware ESX), vmwarews (VMware Workstation) and more. Refer to
     # documentation for available drivers (http://libvirt.org/drivers.html).
-    libvirt.driver = "qemu"
+    libvirt.driver = "kvm"
 
     # The name of the server, where libvirtd is running.
     libvirt.host = "localhost"

data/lib/vagrant-libvirt/action.rb

@@ -18,32 +18,35 @@ module VagrantPlugins
             if !env[:result]
               b2.use SetNameOfDomain
               b2.use HandleStoragePool
-              b2.use HandleBoxUrl
+              b2.use HandleBox
               b2.use HandleBoxImage
               b2.use CreateDomainVolume
               b2.use CreateDomain
 
-              b2.use TimedProvision
+              b2.use Provision
               b2.use CreateNetworks
               b2.use CreateNetworkInterfaces
 
+
+              b2.use PrepareNFSValidIds
+              b2.use SyncedFolderCleanup
+              b2.use SyncedFolders
+
               b2.use StartDomain
               b2.use WaitTillUp
 
-              if Vagrant::VERSION < "1.4.0"
-                b2.use NFS
-              else
-                b2.use PrepareNFSValidIds
-                b2.use SyncedFolderCleanup
-                b2.use SyncedFolders
-              end
+              b2.use StartDomain
+              b2.use WaitTillUp
+
+              
+
 
               b2.use ForwardPorts
 
               b2.use PrepareNFSSettings
               b2.use ShareFolders
               b2.use SetHostname
-              b2.use SyncFolders
+              # b2.use SyncFolders
             else
               b2.use action_start
             end
@@ -74,6 +77,11 @@ module VagrantPlugins
               # Ensure networks are created and active
               b3.use CreateNetworks
 
+              b3.use PrepareNFSValidIds
+              b3.use SyncedFolderCleanup
+              b3.use SyncedFolders
+
+
               # Start it..
               b3.use StartDomain
 
@@ -81,14 +89,6 @@ module VagrantPlugins
               # so wait for dhcp lease and store IP into machines data_dir.
               b3.use WaitTillUp
 
-              # Handle shared folders
-              if Vagrant::VERSION < "1.4.0"
-                b3.use NFS
-              else
-                b3.use PrepareNFSValidIds
-                b3.use SyncedFolderCleanup
-                b3.use SyncedFolders
-              end
 
               b3.use ForwardPorts
               b3.use PrepareNFSSettings
@@ -156,7 +156,7 @@ module VagrantPlugins
 
             b2.use ConnectLibvirt
             b2.use ClearForwardedPorts
-            b2.use PruneNFSExports
+            # b2.use PruneNFSExports
             b2.use DestroyDomain
             b2.use DestroyNetworks
           end
@@ -204,7 +204,7 @@ module VagrantPlugins
               end
 
               b3.use Provision
-              b3.use SyncFolders
+              # b3.use SyncFolders
             end
           end
         end
@@ -321,25 +321,29 @@ module VagrantPlugins
       autoload :MessageNotCreated, action_root.join('message_not_created')
       autoload :MessageNotRunning, action_root.join('message_not_running')
       autoload :MessageNotSuspended, action_root.join('message_not_suspended')
+
       autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
       autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
       autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
+
       autoload :ReadSSHInfo, action_root.join('read_ssh_info')
       autoload :ReadState, action_root.join('read_state')
       autoload :ResumeDomain, action_root.join('resume_domain')
       autoload :SetNameOfDomain, action_root.join('set_name_of_domain')
+      
+      # I don't think we need it anymore 
       autoload :ShareFolders, action_root.join('share_folders')
       autoload :StartDomain, action_root.join('start_domain')
       autoload :SuspendDomain, action_root.join('suspend_domain')
-      autoload :SyncFolders, action_root.join('sync_folders')
       autoload :TimedProvision, action_root.join('timed_provision')
+
       autoload :WaitTillUp, action_root.join('wait_till_up')
+      autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
+
       autoload :SSHRun,  'vagrant/action/builtin/ssh_run'
-      autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url'
-      unless Vagrant::VERSION < "1.4.0"
-        autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
-        autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
-      end
+      autoload :HandleBox, 'vagrant/action/builtin/handle_box'
+      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
+      autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
     end
   end
 end

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

@@ -23,9 +23,9 @@ module VagrantPlugins
           config = env[:machine].provider_config
 
           # Setup connection uri.
-          uri = config.driver
+          uri = config.driver.dup
           virt_path = case uri
-          when 'qemu', 'openvz', 'uml', 'phyp', 'parallels'
+          when 'qemu', 'openvz', 'uml', 'phyp', 'parallels', 'kvm'
             '/system'
           when 'xen', 'esx'
             '/'
@@ -34,6 +34,9 @@ module VagrantPlugins
           else
             raise "Require specify driver #{uri}"
           end
+          if uri == 'kvm'
+            uri = 'qemu'	# use qemu uri for kvm domain type
+          end
 
           if config.connect_via_ssh
             uri << '+ssh://'
@@ -57,8 +60,10 @@ module VagrantPlugins
           if config.id_ssh_key_file
             # set ssh key for access to libvirt host
             home_dir = `echo ${HOME}`.chomp
-            uri << "&keyfile=#{home_dir}/.ssh/"+config.id_ssh_key_file
+            uri << "\&keyfile=#{home_dir}/.ssh/"+config.id_ssh_key_file
           end
+          # set path to libvirt socket
+          uri << "\&socket="+config.socket if config.socket
 
           conn_attr = {}
           conn_attr[:provider] = 'libvirt'
@@ -68,8 +73,7 @@ module VagrantPlugins
 
           # Setup command for retrieving IP address for newly created machine
           # with some MAC address. Get it from dnsmasq leases table
-          ip_command =  %q[ LEASES=$(find /var/lib/libvirt/dnsmasq/ /var/lib/misc/ -name '*leases'); ]
-          ip_command << %q[ [ -n "$LEASES" ] && grep $mac $LEASES | awk '{ print $3 }' ]
+          ip_command = %q[ find /var/lib/libvirt/dnsmasq/ /var/lib/misc/ -name '*leases' -exec grep $mac {} \; | cut -d' ' -f3 ]
           conn_attr[:libvirt_ip_command] = ip_command
 
           @logger.info("Connecting to Libvirt (#{uri}) ...")

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

@@ -12,6 +12,14 @@ module VagrantPlugins
           @app = app
         end
 
+        def _disk_name(name, disk)
+          return "#{name}-#{disk[:device]}.#{disk[:type]}"	# disk name
+        end
+
+        def _disks_print(disks)
+          return disks.collect{ |x| x[:device]+'('+x[:type]+','+x[:size]+')' }.join(', ')
+        end
+
         def call(env)
           # Get config.
           config = env[:machine].provider_config
@@ -28,8 +36,12 @@ module VagrantPlugins
           @cmd_line = config.cmd_line
           @initrd = config.initrd
 
-          # TODO get type from driver config option
-          @domain_type = 'kvm'
+          # Storage
+          @storage_pool_name = config.storage_pool_name
+          @disks = config.disks
+
+          config = env[:machine].provider_config
+          @domain_type = config.driver
 
           @os_type = 'hvm'
 
@@ -39,6 +51,32 @@ module VagrantPlugins
           raise Errors::DomainVolumeExists if domain_volume == nil
           @domain_volume_path = domain_volume.path
 
+          # the default storage prefix is typically: /var/lib/libvirt/images/
+          storage_prefix = File.dirname(@domain_volume_path)+'/'	# steal
+
+          @disks.each do |disk|
+            disk[:name] = _disk_name(@name, disk)
+            if disk[:path].nil?
+              disk[:path] = "#{storage_prefix}#{_disk_name(@name, disk)}"	# automatically chosen!
+            end
+
+            # make the disk. equivalent to:
+            # qemu-img create -f qcow2 <path> 5g
+            begin
+              #puts "Making disk: #{d}, #{t}, #{p}"
+              domain_volume_disk = env[:libvirt_compute].volumes.create(
+                :name => disk[:name],
+                :format_type => disk[:type],
+                :path => disk[:path],
+                :capacity => disk[:size],
+                #:allocation => ?,
+                :pool_name => @storage_pool_name)
+            rescue Fog::Errors::Error => e
+              raise Errors::FogDomainVolumeCreateError,
+                :error_message => e.message
+            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}")
@@ -46,11 +84,17 @@ module VagrantPlugins
           env[:ui].info(" -- Cpus:          #{@cpus}")
           env[:ui].info(" -- Memory:        #{@memory_size/1024}M")
           env[:ui].info(" -- Base box:      #{env[:machine].box.name}")
-          env[:ui].info(" -- Storage pool:  #{env[:machine].provider_config.storage_pool_name}")
+          env[:ui].info(" -- Storage pool:  #{@storage_pool_name}")
           env[:ui].info(" -- Image:         #{@domain_volume_path}")
           env[:ui].info(" -- Volume Cache:  #{@domain_volume_cache}")
           env[:ui].info(" -- Kernel:        #{@kernel}")
           env[:ui].info(" -- Initrd:        #{@initrd}")
+          if @disks.length > 0
+            env[:ui].info(" -- Disks:         #{_disks_print(@disks)}")
+          end
+          @disks.each do |disk|
+            env[:ui].info(" -- Disk(#{disk[:device]}):     #{disk[:path]}")
+          end
           env[:ui].info(" -- Command line : #{@cmd_line}")
 
           # Create libvirt domain.

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

@@ -70,9 +70,11 @@ module VagrantPlugins
 
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network
-              template_name = 'public_interface'
               @device = iface_configuration.fetch(:dev, 'eth0')
+              @type = iface_configuration.fetch(:type, 'direct')
               @mode = iface_configuration.fetch(:mode, 'bridge')
+              @model_type = iface_configuration.fetch(:model_type, 'e1000')
+              template_name = 'public_interface'
               @logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
             end
 
@@ -147,6 +149,10 @@ module VagrantPlugins
           # Get list of all (active and inactive) libvirt networks.
           available_networks = libvirt_networks(libvirt_client)
 
+          if options[:iface_type] == :public_network
+            return 'public'
+          end
+
           if options[:ip]
             address = network_address(options[:ip], options[:netmask])
             available_networks.each do |network|
@@ -157,7 +163,7 @@ module VagrantPlugins
             end
           end
 
-          raise NetworkNotAvailableError, network_name: options[:ip]
+          raise Errors::NetworkNotAvailableError, network_name: options[:ip]
         end
       end
     end

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

@@ -47,8 +47,8 @@ module VagrantPlugins
             ))
 
             ssh_pid = redirect_port(
-              @env[:machine].name,
-              fp[:host_ip] || '0.0.0.0',
+              @env[:machine],
+              fp[:host_ip] || 'localhost',
               fp[:host],
               fp[:guest_ip] || @env[:machine].provider.ssh_info[:host],
               fp[:guest]
@@ -77,13 +77,24 @@ module VagrantPlugins
         end
 
         def redirect_port(machine, host_ip, host_port, guest_ip, guest_port)
+          ssh_info = machine.ssh_info
           params = %W(
-            #{machine}
-            -L #{host_ip}:#{host_port}:#{guest_ip}:#{guest_port}
+            "-L #{host_ip}:#{host_port}:#{guest_ip}:#{guest_port}"
             -N
+            #{ssh_info[:host]}
           ).join(' ')
-          # TODO get options without shelling out
-          options = `vagrant ssh-config #{machine} | awk '{printf " -o "$1"="$2}'`
+
+          options = (%W(
+            User=#{ssh_info[:username]}
+            Port=#{ssh_info[:port]}
+            UserKnownHostsFile=/dev/null
+            StrictHostKeyChecking=no
+            PasswordAuthentication=no
+            ForwardX11=#{ssh_info[:forward_x11] ? 'yes' : 'no'}
+          ) + ssh_info[:private_key_path].map do |pk|
+              "IdentityFile=#{pk}"
+            end).map { |s| s.prepend('-o ') }.join(' ')
+            
           ssh_cmd = "ssh #{options} #{params}"
 
           @logger.debug "Forwarding port with `#{ssh_cmd}`"

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

@@ -15,7 +15,8 @@ module VagrantPlugins
             uuids = env[:libvirt_compute].servers.all.map(&:id)
             # not exiisted in array will removed from nfs
             uuids.delete(uuid)
-            env[:host].nfs_prune(uuids)
+            env[:host].capability(
+              :nfs_prune, env[:machine].ui, uuids)
           end
 
           @app.call(env)

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

@@ -19,13 +19,29 @@ module VagrantPlugins
         def read_state(libvirt, machine)
           return :not_created if machine.id.nil?
 
+          begin
+            server = libvirt.servers.get(machine.id)
+          rescue Libvirt::RetrieveError => e
+            server = nil
+            @logger.debug('Machine not found #{e}.')
+          end
           # Find the machine
-          server = libvirt.servers.get(machine.id)
-          if server.nil? || [:'shutting-down', :terminated].include?(server.state.to_sym)
-            # The machine can't be found
-            @logger.info('Machine not found or terminated, assuming it got destroyed.')
-            machine.id = nil
-            return :not_created
+          begin
+            server = libvirt.servers.get(machine.id)
+            if server.nil? || [:'shutting-down', :terminated].include?(server.state.to_sym)
+              # The machine can't be found
+              @logger.info('Machine shutting down or terminated, assuming it got destroyed.')
+              machine.id = nil
+              return :not_created
+            end
+          rescue Libvirt::RetrieveError => e
+            if e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
+              @logger.info("Machine #{machine.id} not found.")
+              machine.id = nil
+              return :not_created
+            else
+              raise e
+            end
           end
 
           # Return the state

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

@@ -21,10 +21,16 @@ module VagrantPlugins
           env[:domain_name] << '_'
           env[:domain_name] << env[:machine].name.to_s
           
+          begin
           @logger.info("Looking for domain #{env[:domain_name]} through list #{env[:libvirt_compute].servers.all}")
           # Check if the domain name is not already taken
-          domain = ProviderLibvirt::Util::Collection.find_matching(
+          
+            domain = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].servers.all, env[:domain_name])
+          rescue Fog::Errors::Error => e
+            @logger.info("#{e}")
+            domain = nil
+          end
 
           @logger.info("Looking for domain #{env[:domain_name]}")
 

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

@@ -0,0 +1,40 @@
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Cap
+      class MountP9
+        extend Vagrant::Util::Retryable
+
+        def self.mount_p9_shared_folder(machine, folders, options)
+          folders.each do |name, opts|
+            # Expand the guest path so we can handle things like "~/vagrant"
+            expanded_guest_path = machine.guest.capability(
+              :shell_expand_guest_path, opts[:guestpath])
+
+            # Do the actual creating and mounting
+            machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+
+            # Mount
+            mount_tag = name.dup
+
+            mount_opts="-o trans=virtio"
+            mount_opts += ",access=#{options[:owner]}" if options[:owner]
+            mount_opts += ",version=#{options[:version]}" if options[:version]
+            mount_opts += ",#{opts[:mount_options]}" if opts[:mount_options]
+
+            mount_command = "mount -t 9p #{mount_opts} '#{mount_tag}' #{expanded_guest_path}"
+            retryable(:on => Vagrant::Errors::LinuxMountFailed,
+                      :tries => 5,
+                      :sleep => 3) do
+              machine.communicate.sudo('modprobe 9p')
+              machine.communicate.sudo('modprobe 9pnet_virtio')
+              machine.communicate.sudo(mount_command,
+                      :error_class => Vagrant::Errors::LinuxMountFailed)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+require "log4r"
+require 'ostruct'
+require 'nokogiri'
+
+
+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)
+      include Vagrant::Util
+      include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+
+      def initialize(*args)
+        super
+
+        @logger = Log4r::Logger.new("vagrant_libvirt::synced_folders::9p")
+      end
+
+      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
+      end
+
+      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 })
+            machine.ui.info "================\nMachine id: #{machine.id}\nShould be mounting folders\n #{id}, opts: #{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 
+        rescue => e
+          machine.ui.error("could not attach device because: #{e}")
+          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")
+        # Only mount folders that have a guest path specified.
+        mount_folders = {}
+        folders.each do |id, opts|
+          mount_folders[id] = opts.dup if opts[:guestpath]
+        end
+        common_opts = {
+          :version => '9p2000.L',
+        }
+        # Mount the actual folder
+        machine.guest.capability(
+            :mount_p9_shared_folder, mount_folders, common_opts)
+      end
+
+      def cleanup(machine, _opts)
+
+        raise Vagrant::Errors::Error("No libvirt connection") if ProviderLibvirt.libvirt_connection.nil?
+
+        @conn = ProviderLibvirt.libvirt_connection.client
+ 
+        begin
+          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|
+              dom.detach_device(xml.to_s)
+
+              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
+        end
+
+      end
+
+    end
+  end
+end

data/lib/vagrant-libvirt/config.rb

@@ -1,5 +1,14 @@
 require 'vagrant'
 
+class Numeric
+  Alphabet = ('a'..'z').to_a
+  def vdev
+    s, q = '', self
+    (q, r = (q - 1).divmod(26)) && s.prepend(Alphabet[r]) until q.zero?
+    'vd'+s
+  end
+end
+
 module VagrantPlugins
   module ProviderLibvirt
     class Config < Vagrant.plugin('2', :config)
@@ -12,6 +21,9 @@ module VagrantPlugins
       # If use ssh tunnel to connect to Libvirt.
       attr_accessor :connect_via_ssh
 
+      # Path towards the libvirt socket
+      attr_accessor :socket
+
       # The username to access Libvirt.
       attr_accessor :username
 
@@ -43,6 +55,9 @@ module VagrantPlugins
       attr_accessor :cmd_line
       attr_accessor :initrd
 
+      # Storage
+      attr_accessor :disks
+
       def initialize
         @driver            = UNSET_VALUE
         @host              = UNSET_VALUE
@@ -64,10 +79,51 @@ module VagrantPlugins
         @kernel            = UNSET_VALUE
         @initrd            = UNSET_VALUE
         @cmd_line          = UNSET_VALUE
+
+        # Storage
+        @disks             = UNSET_VALUE
+      end
+
+      def _get_device(disks)
+        disks = [] if disks == UNSET_VALUE
+        # skip existing devices and also the first one (vda)
+        exist = disks.collect {|x| x[:device]}+[1.vdev.to_s]
+        skip = 1		# we're 1 based, not 0 based...
+        while true do
+          dev = skip.vdev	# get lettered device
+          if !exist.include?(dev)
+            return dev
+          end
+          skip+=1
+        end
+      end
+
+      # NOTE: this will run twice for each time it's needed- keep it idempotent
+      def storage(storage_type, options={})
+        options = {
+          :device => _get_device(@disks),
+          :type => 'qcow2',
+          :size => '10G',	# matches the fog default
+          :path => nil,
+        }.merge(options)
+
+        #puts "storage(#{storage_type} --- #{options.to_s})"
+        @disks = [] if @disks == UNSET_VALUE
+
+        disk = {
+          :device => options[:device],
+          :type => options[:type],
+          :size => options[:size],
+          :path => options[:path],
+        }
+
+        if storage_type == :file
+          @disks << disk	# append
+        end
       end
 
       def finalize!
-        @driver = 'qemu' if @driver == UNSET_VALUE
+        @driver = 'kvm' if @driver == UNSET_VALUE
         @host = nil if @host == UNSET_VALUE
         @connect_via_ssh = false if @connect_via_ssh == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
@@ -87,6 +143,9 @@ module VagrantPlugins
         @kernel = nil if @kernel == UNSET_VALUE
         @cmd_line = '' if @cmd_line == UNSET_VALUE
         @initrd = '' if @initrd == UNSET_VALUE
+
+        # Storage
+        @disks = [] if @disks == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-libvirt/errors.rb

@@ -122,6 +122,10 @@ module VagrantPlugins
         error_key(:attach_device_error)
       end
 
+      class DetachDeviceError < VagrantLibvirtError
+        error_key(:detach_device_error)
+      end
+
       class NoIpAddressError < VagrantLibvirtError
         error_key(:no_ip_address_error)
       end

data/lib/vagrant-libvirt/plugin.rb

@@ -6,8 +6,8 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < '1.3.0'
-  raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.3+'
+if Vagrant::VERSION < '1.5.0'
+  raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.5+'
 end
 
 module VagrantPlugins
@@ -31,6 +31,18 @@ module VagrantPlugins
         require_relative 'provider'
         Provider
       end
+      
+      guest_capability("linux", "mount_p9_shared_folder") do
+        require_relative "cap/mount_p9"
+        Cap::MountP9
+      end
+
+      # lower priority than nfs or rsync
+      # https://github.com/pradels/vagrant-libvirt/pull/170
+      synced_folder("9p", 4) do
+        require_relative "cap/synced_folder"
+        VagrantPlugins::SyncedFolder9p::SyncedFolder
+      end
 
       # This initializes the internationalization strings.
       def self.setup_i18n

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

@@ -31,6 +31,17 @@
       <%# we need to ensure a unique target dev -%>
       <target dev='vda' bus='<%= @disk_bus %>'/>
     </disk>
+<%# additional disks -%>
+<% @disks.each do |d| -%>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='<%= d[:type] %>'/>
+      <source file='<%= d[:path] %>'/>
+      <target dev='<%= d[:device] %>' bus='virtio'/>
+<%# this will get auto generated by libvirt
+      <address type='pci' domain='0x0000' bus='0x00' slot='???' function='0x0'/>
+-%>
+    </disk>
+<% end -%>
     <serial type='pty'>
       <target port='0'/>
     </serial>

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

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

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

@@ -1,7 +1,13 @@
-<interface type='direct'>
+<interface type='<%= @type %>'>
 	<% if @mac %>
   	<mac address='<%= @mac %>'/>
   <% end %>
+  <%if @type == 'direct'%>
   <source dev='<%= @device %>' mode='<%= @mode %>'/>
+  <% else %>
+  <source bridge='<%=@device%>'/>
+  <model type='<%=@model_type%>'/>
+  <% end %>
 </interface>
 
+

data/lib/vagrant-libvirt/util.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
       autoload :Collection,  'vagrant-libvirt/util/collection'
       autoload :Timer,  'vagrant-libvirt/util/timer'
       autoload :NetworkUtil,  'vagrant-libvirt/util/network_util'
+      autoload :ErrorCodes,  'vagrant-libvirt/util/error_codes'
     end
   end
 end

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

@@ -1,17 +1,21 @@
-require 'erb'
+require 'erubis'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Util
       module ErbTemplate
 
-        # Taken from fog source.
-        def to_xml template_name = nil
+        
+        # TODO might be a chance to use vagrant template system according to https://github.com/mitchellh/vagrant/issues/3231
+        def to_xml template_name = nil, data = binding
           erb = template_name || self.class.to_s.split("::").last.downcase
           path = File.join(File.dirname(__FILE__), "..", "templates",
                            "#{erb}.xml.erb")
           template = File.read(path)
-          ERB.new(template, nil, '-').result(binding)
+
+          # TODO according to erubis documentation, we should rather use evaluate and forget about 
+          # binding since the template may then change variables values
+          Erubis::Eruby.new(template, :trim => true).result(data)
         end
  
       end

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

@@ -0,0 +1,101 @@
+# Ripped from http://libvirt.org/html/libvirt-virterror.html#virErrorNumber.
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module ErrorCodes
+        VIR_ERR_OK = 0
+        VIR_ERR_INTERNAL_ERROR = 1 # internal error
+        VIR_ERR_NO_MEMORY = 2 # memory allocation failure
+        VIR_ERR_NO_SUPPORT  = 3 # no support for this function
+        VIR_ERR_UNKNOWN_HOST  = 4 # could not resolve hostname
+        VIR_ERR_NO_CONNECT  = 5 # can't connect to hypervisor
+        VIR_ERR_INVALID_CONN  = 6 # invalid connection object
+        VIR_ERR_INVALID_DOMAIN  = 7 # invalid domain object
+        VIR_ERR_INVALID_ARG = 8 # invalid function argument
+        VIR_ERR_OPERATION_FAILED  = 9 # a command to hypervisor failed
+        VIR_ERR_GET_FAILED  = 10 # a HTTP GET command to failed
+        VIR_ERR_POST_FAILED = 11 # a HTTP POST command to failed
+        VIR_ERR_HTTP_ERROR  = 12 # unexpected HTTP error code
+        VIR_ERR_SEXPR_SERIAL  = 13 # failure to serialize an S-Expr
+        VIR_ERR_NO_XEN  = 14 # could not open Xen hypervisor control
+        VIR_ERR_XEN_CALL  = 15 # failure doing an hypervisor call
+        VIR_ERR_OS_TYPE = 16 # unknown OS type
+        VIR_ERR_NO_KERNEL = 17 # missing kernel information
+        VIR_ERR_NO_ROOT = 18 # missing root device information
+        VIR_ERR_NO_SOURCE = 19 # missing source device information
+        VIR_ERR_NO_TARGET = 20 # missing target device information
+        VIR_ERR_NO_NAME = 21 # missing domain name information
+        VIR_ERR_NO_OS = 22 # missing domain OS information
+        VIR_ERR_NO_DEVICE = 23 # missing domain devices information
+        VIR_ERR_NO_XENSTORE = 24 # could not open Xen Store control
+        VIR_ERR_DRIVER_FULL = 25 # too many drivers registered
+        VIR_ERR_CALL_FAILED = 26 # not supported by the drivers (DEPRECATED)
+        VIR_ERR_XML_ERROR = 27 # an XML description is not well formed or broken
+        VIR_ERR_DOM_EXIST = 28 # the domain already exist
+        VIR_ERR_OPERATION_DENIED  = 29 # operation forbidden on read-only connections
+        VIR_ERR_OPEN_FAILED = 30 # failed to open a conf file
+        VIR_ERR_READ_FAILED = 31 # failed to read a conf file
+        VIR_ERR_PARSE_FAILED  = 32 # failed to parse a conf file
+        VIR_ERR_CONF_SYNTAX = 33 # failed to parse the syntax of a conf file
+        VIR_ERR_WRITE_FAILED  = 34 # failed to write a conf file
+        VIR_ERR_XML_DETAIL  = 35 # detail of an XML error
+        VIR_ERR_INVALID_NETWORK = 36 # invalid network object
+        VIR_ERR_NETWORK_EXIST = 37 # the network already exist
+        VIR_ERR_SYSTEM_ERROR  = 38 # general system call failure
+        VIR_ERR_RPC = 39 # some sort of RPC error
+        VIR_ERR_GNUTLS_ERROR  = 40 # error from a GNUTLS call
+        VIR_WAR_NO_NETWORK  = 41 # failed to start network
+        VIR_ERR_NO_DOMAIN = 42 # domain not found or unexpectedly disappeared
+        VIR_ERR_NO_NETWORK  = 43 # network not found
+        VIR_ERR_INVALID_MAC = 44 # invalid MAC address
+        VIR_ERR_AUTH_FAILED = 45 # authentication failed
+        VIR_ERR_INVALID_STORAGE_POOL  = 46 # invalid storage pool object
+        VIR_ERR_INVALID_STORAGE_VOL = 47 # invalid storage vol object
+        VIR_WAR_NO_STORAGE  = 48 # failed to start storage
+        VIR_ERR_NO_STORAGE_POOL = 49 # storage pool not found
+        VIR_ERR_NO_STORAGE_VOL  = 50 # storage volume not found
+        VIR_WAR_NO_NODE = 51 # failed to start node driver
+        VIR_ERR_INVALID_NODE_DEVICE = 52 # invalid node device object
+        VIR_ERR_NO_NODE_DEVICE  = 53 # node device not found
+        VIR_ERR_NO_SECURITY_MODEL = 54 # security model not found
+        VIR_ERR_OPERATION_INVALID = 55 # operation is not applicable at this time
+        VIR_WAR_NO_INTERFACE  = 56 # failed to start interface driver
+        VIR_ERR_NO_INTERFACE  = 57 # interface driver not running
+        VIR_ERR_INVALID_INTERFACE = 58 # invalid interface object
+        VIR_ERR_MULTIPLE_INTERFACES = 59 # more than one matching interface found
+        VIR_WAR_NO_NWFILTER = 60 # failed to start nwfilter driver
+        VIR_ERR_INVALID_NWFILTER  = 61 # invalid nwfilter object
+        VIR_ERR_NO_NWFILTER = 62 # nw filter pool not found
+        VIR_ERR_BUILD_FIREWALL  = 63 # nw filter pool not found
+        VIR_WAR_NO_SECRET = 64 # failed to start secret storage
+        VIR_ERR_INVALID_SECRET  = 65 # invalid secret
+        VIR_ERR_NO_SECRET = 66 # secret not found
+        VIR_ERR_CONFIG_UNSUPPORTED  = 67 # unsupported configuration construct
+        VIR_ERR_OPERATION_TIMEOUT = 68 # timeout occurred during operation
+        VIR_ERR_MIGRATE_PERSIST_FAILED  = 69 # a migration worked, but making the VM persist on the dest host failed
+        VIR_ERR_HOOK_SCRIPT_FAILED  = 70 # a synchronous hook script failed
+        VIR_ERR_INVALID_DOMAIN_SNAPSHOT = 71 # invalid domain snapshot
+        VIR_ERR_NO_DOMAIN_SNAPSHOT  = 72 # domain snapshot not found
+        VIR_ERR_INVALID_STREAM  = 73 # stream pointer not valid
+        VIR_ERR_ARGUMENT_UNSUPPORTED  = 74 # valid API use but unsupported by the given driver
+        VIR_ERR_STORAGE_PROBE_FAILED  = 75 # storage pool probe failed
+        VIR_ERR_STORAGE_POOL_BUILT  = 76 # storage pool already built
+        VIR_ERR_SNAPSHOT_REVERT_RISKY = 77 # force was not requested for a risky domain snapshot revert
+        VIR_ERR_OPERATION_ABORTED = 78 # operation on a domain was canceled/aborted by user
+        VIR_ERR_AUTH_CANCELLED  = 79 # authentication cancelled
+        VIR_ERR_NO_DOMAIN_METADATA  = 80 # The metadata is not present
+        VIR_ERR_MIGRATE_UNSAFE  = 81 # Migration is not safe
+        VIR_ERR_OVERFLOW  = 82 # integer overflow
+        VIR_ERR_BLOCK_COPY_ACTIVE = 83 # action prevented by block copy job
+        VIR_ERR_OPERATION_UNSUPPORTED = 84 # The requested operation is not supported
+        VIR_ERR_SSH = 85 # error in ssh transport driver
+        VIR_ERR_AGENT_UNRESPONSIVE  = 86 # guest agent is unresponsive, not running or not usable
+        VIR_ERR_RESOURCE_BUSY = 87 # resource is already in use
+        VIR_ERR_ACCESS_DENIED = 88 # operation on the object/resource was denied
+        VIR_ERR_DBUS_SERVICE  = 89 # error from a dbus service
+        VIR_ERR_STORAGE_VOL_EXIST = 90 # the storage vol already exists
+      end
+    end
+  end
+end
+

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.15'
+    VERSION = '0.0.16'
   end
 end

data/locales/en.yml

@@ -99,6 +99,8 @@ en:
         No domain found. %{error_message}
       attach_device_error: |-
         Error while attaching new device to domain. %{error_message}
+      detach_device_error: |-
+        Error while detaching device from domain. %{error_message}
       no_ip_address_error: |-
         No IP address found.
       management_network_error: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -116,15 +116,16 @@ files:
 - lib/vagrant-libvirt/action/share_folders.rb
 - lib/vagrant-libvirt/action/start_domain.rb
 - lib/vagrant-libvirt/action/suspend_domain.rb
-- lib/vagrant-libvirt/action/sync_folders.rb
-- lib/vagrant-libvirt/action/timed_provision.rb
 - lib/vagrant-libvirt/action/wait_till_up.rb
+- lib/vagrant-libvirt/cap/mount_p9.rb
+- lib/vagrant-libvirt/cap/synced_folder.rb
 - lib/vagrant-libvirt/config.rb
 - lib/vagrant-libvirt/errors.rb
 - lib/vagrant-libvirt/plugin.rb
 - lib/vagrant-libvirt/provider.rb
 - lib/vagrant-libvirt/templates/default_storage_pool.xml.erb
 - lib/vagrant-libvirt/templates/domain.xml.erb
+- lib/vagrant-libvirt/templates/filesystem.xml.erb
 - lib/vagrant-libvirt/templates/interface.xml.erb
 - lib/vagrant-libvirt/templates/private_network.xml.erb
 - lib/vagrant-libvirt/templates/public_interface.xml.erb
@@ -132,6 +133,7 @@ files:
 - lib/vagrant-libvirt/util.rb
 - lib/vagrant-libvirt/util/collection.rb
 - lib/vagrant-libvirt/util/erb_template.rb
+- lib/vagrant-libvirt/util/error_codes.rb
 - lib/vagrant-libvirt/util/network_util.rb
 - lib/vagrant-libvirt/util/timer.rb
 - lib/vagrant-libvirt/version.rb
@@ -158,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Vagrant provider for libvirt.

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

@@ -1,66 +0,0 @@
-require "log4r"
-require "vagrant/util/subprocess"
-
-module VagrantPlugins
-  module ProviderLibvirt
-    module Action
-      # This middleware uses `rsync` to sync the folders over to the
-      # libvirt domain.
-      class SyncFolders
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::sync_folders")
-        end
-
-        def call(env)
-          @app.call(env)
-
-          ssh_info = env[:machine].ssh_info
-
-          env[:machine].config.vm.synced_folders.each do |id, data|
-            next if data[:type] == :nfs
-            proxycommand = "-o ProxyCommand='#{ssh_info[:proxy_command]}'" if ssh_info[:proxy_command]
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            # Make sure there is a trailing slash on the host path to
-            # avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            env[:ui].info(I18n.t('vagrant_libvirt.rsync_folder',
-                                :hostpath => hostpath,
-                                :guestpath => guestpath))
-
-            # Create the guest path
-            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-            env[:machine].communicate.sudo(
-              "chown #{ssh_info[:username]} '#{guestpath}'")
-
-            # Rsync over to the guest path using the SSH info
-            command = [
-              'rsync', '--del', '--verbose', '--archive', '-z',
-              '--exclude', '.vagrant/',
-              '-e', "ssh -p #{ssh_info[:port]} #{proxycommand} -o StrictHostKeyChecking=no  #{ssh_key_options(ssh_info)}",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
-            end
-          end
-        end
-        private
-
-        def ssh_key_options(ssh_info)
-          # Ensure that `private_key_path` is an Array (for Vagrant < 1.4)
-          Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,21 +0,0 @@
-require 'vagrant-libvirt/util/timer'
-
-module VagrantPlugins
-  module ProviderLibvirt
-    module Action
-      # This is the same as the builtin provision except it times the
-      # provisioner runs.
-      class TimedProvision < Vagrant::Action::Builtin::Provision
-        def run_provisioner(env)
-          timer = Util::Timer.time do
-            super
-          end
-
-          env[:metrics] ||= {}
-          env[:metrics]['provisioner_times'] ||= []
-          env[:metrics]['provisioner_times'] << [env[:provisioner].class.to_s, timer]
-        end
-      end
-    end
-  end
-end