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

Don't raise an error when ip address is not found when calling ssh_info

Browse Source 
Vagrant defines that, when the ssh info is not available, the method
should return nil, instead of raising exception:
https://github.com/mitchellh/vagrant/blob/v1.7.2/lib/vagrant/plugin/v2/provider.rb#L52-L75

Also, as per
efd1d5e11b/plugins/providers/virtualbox/provider.rb (L60) , not getting into waiting for the ssh info
when the machine is not running.

The motivation for this patch is the ansible integration issues when raising
the errors and waiting for the ssh info. See also:
https://github.com/mitchellh/vagrant/pull/5743
This commit is contained in:
Ivan Nečas 2015-05-27 12:51:31 +02:00
parent 27710febe5
commit ba619e04bb
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) def read_ssh_info(libvirt, machine)
return nil if machine.id.nil? return nil if machine.id.nil?
return nil if machine.state.id != :running
# Find the machine # Find the machine
domain = libvirt.servers.get(machine.id) domain = libvirt.servers.get(machine.id)
@ -32,15 +33,23 @@ module VagrantPlugins
# Get IP address from dnsmasq lease file. # Get IP address from dnsmasq lease file.
ip_address = nil ip_address = nil
domain.wait_for(2) { begin
addresses.each_pair do |type, ip| domain.wait_for(2) do
# Multiple leases are separated with a newline, return only addresses.each_pair do |type, ip|
# the most recent address # Multiple leases are separated with a newline, return only
ip_address = ip[0].split("\n").first if ip[0] != nil # the most recent address
ip_address = ip[0].split("\n").first if ip[0] != nil
end
ip_address != nil
end end
ip_address != nil rescue Fog::Errors::TimeoutError
} @logger.info("Timeout at waiting for an ip address for machine %s" % machine.name)
raise Errors::NoIpAddressError if not ip_address end
if not ip_address
@logger.info("No lease found for machine %s" % machine.name)
return nil
end
ssh_info = { ssh_info = {
:host => ip_address, :host => ip_address,