iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3208 from rickard-von-essen/openstack-messages-ssh 

OpenStack: Change some log messages about SSH to connect.
This commit is contained in:
Rickard von Essen 2016-02-16 11:17:03 +01:00
parent b07f54ddc5 c3bc87cb71
commit 32bbe55f2b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/openstack/ssh.go
View File

@ -23,7 +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)
log.Printf("[DEBUG] Using IP address %s from specified interface %s to connect", addr, sshinterface)
return addr, nil
}
}
@ -31,18 +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)
log.Printf("[DEBUG] Using floating IP %s to connect", ip.IP)
return ip.IP, nil
}
if s.AccessIPv4 != "" {
log.Printf("[DEBUG] Using AccessIPv4 %s for SSH", s.AccessIPv4)
log.Printf("[DEBUG] Using AccessIPv4 %s to connect", 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)
log.Printf("[DEBUG] Using IP address %s to connect", addr)
return addr, nil
}