NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #379 from iNecas/no-exception-when-ip-not-ready

Browse Source 
Don't raise an error when ip address is not found when calling ssh_info
This commit is contained in:
Dmitry Vasilets 2015-05-28 10:03:33 +02:00
commit 76942c38ba
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/vagrant-libvirt/action/read_ssh_info.rb
View File

@ -20,6 +20,7 @@ module VagrantPlugins
def read_ssh_info(libvirt, machine)
return nil if machine.id.nil?
return nil if machine.state.id != :running
# Find the machine
domain = libvirt.servers.get(machine.id)
@ -32,15 +33,23 @@ module VagrantPlugins
# Get IP address from dnsmasq lease file.
ip_address = nil
domain.wait_for(2) {
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
begin
domain.wait_for(2) do
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
end
ip_address != nil
end
ip_address != nil
}
raise Errors::NoIpAddressError if not ip_address
rescue Fog::Errors::TimeoutError
@logger.info("Timeout at waiting for an ip address for machine %s" % machine.name)
end
if not ip_address
@logger.info("No lease found for machine %s" % machine.name)
return nil
end
ssh_info = {
:host => ip_address,