Commit bd0ee8d3 authored by Chris Bednarski's avatar Chris Bednarski

Merge pull request #2513 from hazelesque/openstack-ip-debug-logging

openstack builder: log which IP address SSH will use
parents cd9e352b ce54dba2
......@@ -23,6 +23,7 @@ func CommHost(
// If we have a specific interface, try that
if sshinterface != "" {
if addr := sshAddrFromPool(s, sshinterface); addr != "" {
log.Printf("[DEBUG] Using IP address %s from specified interface %s for SSH", addr, sshinterface)
return addr, nil
}
}
......@@ -30,15 +31,18 @@ func CommHost(
// If we have a floating IP, use that
ip := state.Get("access_ip").(*floatingip.FloatingIP)
if ip != nil && ip.IP != "" {
log.Printf("[DEBUG] Using floating IP %s for SSH", ip.IP)
return ip.IP, nil
}
if s.AccessIPv4 != "" {
log.Printf("[DEBUG] Using AccessIPv4 %s for SSH", s.AccessIPv4)
return s.AccessIPv4, nil
}
// Try to get it from the requested interface
if addr := sshAddrFromPool(s, sshinterface); addr != "" {
log.Printf("[DEBUG] Using IP address %s for SSH", addr)
return addr, nil
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment