IP of VM is searched in dnsmasq lease files only.

lib/vagrant-libvirt/action/connect_libvirt.rb

@@ -48,9 +48,14 @@ module VagrantPlugins
           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.
-          conn_attr[:libvirt_ip_command] =  "cat /var/lib/libvirt/dnsmasq/*.leases"
-          conn_attr[:libvirt_ip_command] << " | grep $mac | awk ' { print $3 }'"
+          # with some MAC address. Get it from dnsmasq leases table - either
+          # /var/lib/libvirt/dnsmasq/*.leases files, or
+          # /var/lib/misc/dnsmasq.leases if available.
+          ip_command =  "LEASES='/var/lib/libvirt/dnsmasq/*.leases'; "
+          ip_command << "[ -f /var/lib/misc/dnsmasq.leases ] && "
+          ip_command << "LEASES='/var/lib/misc/dnsmasq.leases'; "
+          ip_command << "cat $LEASES | grep $mac | awk '{ print $3 }'"
+          conn_attr[:libvirt_ip_command] = ip_command
 
           @logger.info("Connecting to Libvirt (#{uri}) ...")
           begin

lib/vagrant-libvirt/action/read_ssh_info.rb

@@ -18,7 +18,7 @@ module VagrantPlugins
           @app.call(env)
         end
 
-        def read_ssh_info(libvirt,machine)
+        def read_ssh_info(libvirt, machine)
           return nil if machine.id.nil?
 
           # Find the machine
@@ -30,53 +30,24 @@ module VagrantPlugins
             return nil
           end
 
-          # IP address of machine is stored in $data_dir/ip file. Why? Commands
-          # like ssh or provision need to get IP of VM long time after it was
-          # started and gathered IP. Record in arp table is lost, and this is
-          # the way how to store this info. Not an ideal solution, but libvirt
-          # doesn't provide way how to get IP of some domain. 
-          ip_file = machine.data_dir + 'ip'
-          raise Errors::NoIpAddressError if not File.exists?(ip_file)
-          ip_address = File.open(ip_file, 'r') do |file|
-            file.read
-          end
-
-          # Check if stored IP address matches with MAC address of machine.
-          # Command is executed either localy, or on remote libvirt hypervisor,
-          # depends on establised fog libvirt connection.
-          ip_match = false
-          ip_command = "ping -c1 #{ip_address} > /dev/null && "
-          ip_command << "arp -an | grep $mac | sed '"
-          ip_command << 's/.*(\([0-9\.]*\)).*/\1/' + "'"
-          options_hash = { :ip_command => ip_command }
-          3.times do |x|
-            break if ip_match
-            domain.wait_for(1) {
-              begin
-                addresses(service, options_hash).each_pair do |type, ip|
-                  if ip[0] != nil
-                    ip_match = true
-                    break
-                  end
-                end
-              rescue Fog::Errors::Error
-                # Sometimes, if pinging happen too quickly after after IP
-                # assignment, machine is not responding yet. Give it a little
-                # time..
-                sleep 1
-              end
-
-              break if ip_match
-            }
-          end
-          raise Errors::IpAddressMismatchError if not ip_match
+          # Get IP address from dnsmasq lease file.
+          ip_address = nil
+          domain.wait_for(2) {
+            addresses.each_pair do |type, ip|
+              ip_address = ip[0] if ip[0] != nil
+            end
+            ip_address != nil
+          }
+          raise Errors::NoIpAddressError if not ip_address
 
           # Return the info
           # TODO: Some info should be configurable in Vagrantfile
           return {
-            :host => ip_address,
-            :port => 22,
-            :username => 'root',
+            :host          => ip_address,
+            :port          => 22,
+            :username      => 'root',
+            :forward_agent => true,
+            :forward_x11   => true,
           }
         end 
       end

lib/vagrant-libvirt/action/wait_till_up.rb

@@ -37,7 +37,7 @@ module VagrantPlugins
               # Wait for domain to obtain an ip address
               domain.wait_for(2) {
                 addresses.each_pair do |type, ip|
-                  env[:ip_address] = ip[0]
+                  env[:ip_address] = ip[0] if ip[0] != nil
                 end
                 env[:ip_address] != nil
               }
@@ -46,14 +46,7 @@ module VagrantPlugins
           terminate(env) if env[:interrupted]
           @logger.info("Got IP address #{env[:ip_address]}")
           @logger.info("Time for getting IP: #{env[:metrics]["instance_ip_time"]}")
-
-          # Save newly assigned IP address to machines data_dir
-          ip_file_path = env[:machine].data_dir + 'ip'
-          @logger.info("Saving IP address to #{ip_file_path} file.")
-          File.open(ip_file_path, 'w') do |file|
-            file.write(env[:ip_address])
-          end
-
+          
           # Machine has ip address assigned, now wait till we are able to
           # connect via ssh.
           env[:metrics]["instance_ssh_time"] = Util::Timer.time do

lib/vagrant-libvirt/errors.rb

@@ -90,10 +90,6 @@ module VagrantPlugins
         error_key(:no_ip_address_error)
       end
 
-      class IpAddressMismatchError < VagrantLibvirtError
-        error_key(:ip_address_mismatch_error)
-      end
-
     end
   end
 end