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

builder/openstack: no more port

This commit is contained in:
Mitchell Hashimoto 2015-06-15 09:34:35 -07:00
parent 5167c65f87
commit d8cc24f86e
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

@ -22,7 +22,7 @@ func CommHost(
// If we have a specific interface, try that
if sshinterface != "" {
if addr := sshAddrFromPool(s, sshinterface, port); addr != "" {
if addr := sshAddrFromPool(s, sshinterface); addr != "" {
return addr, nil
}
}
@ -38,7 +38,7 @@ func CommHost(
}
// Try to get it from the requested interface
if addr := sshAddrFromPool(s, sshinterface, port); addr != "" {
if addr := sshAddrFromPool(s, sshinterface); addr != "" {
return addr, nil
}
@ -75,7 +75,7 @@ func SSHConfig(username string) func(multistep.StateBag) (*ssh.ClientConfig, err
}
}
func sshAddrFromPool(s *servers.Server, desired string, port int) string {
func sshAddrFromPool(s *servers.Server, desired string) string {
// Get all the addresses associated with this server. This
// was taken directly from Terraform.
for pool, networkAddresses := range s.Addresses {
@ -106,7 +106,7 @@ func sshAddrFromPool(s *servers.Server, desired string, port int) string {
}
}
if addr != "" {
return fmt.Sprintf("%s:%d", addr, port)
return addr
}
}
}