docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1100 from hairyhenderson/softlayer-getip-private-fix-1099 

Fixing bug in GetIP where Public IP would always be returned
This commit is contained in:
Evan Hazlett 2015-05-04 12:31:49 -07:00
parent 5404b0e447 bd35fb3101
commit cab881ee16
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/softlayer/driver.go
View File

@ -275,8 +275,12 @@ func (d *Driver) GetIP() (string, error) {
if d.IPAddress != "" { if d.IPAddress != "" {
return d.IPAddress, nil return d.IPAddress, nil
} }
if d.deviceConfig.PrivateNet {
return d.getClient().VirtualGuest().GetPrivateIp(d.Id)
} else {
return d.getClient().VirtualGuest().GetPublicIp(d.Id) return d.getClient().VirtualGuest().GetPublicIp(d.Id)
} }
}
func (d *Driver) GetState() (state.State, error) { func (d *Driver) GetState() (state.State, error) {
s, err := d.getClient().VirtualGuest().PowerState(d.Id) s, err := d.getClient().VirtualGuest().PowerState(d.Id)