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

Merge pull request #2809 from smashwilson/unable-to-find-tenant 

Rackspace: Only derive tenant ID if tenant name is supplied.
This commit is contained in:
Nathan LeClaire 2016-01-12 11:58:38 -08:00
parent 248596da8a 3c2aab2abe
commit 6cc068ee4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/openstack/openstack.go
View File

@ -566,7 +566,7 @@ func (d *Driver) resolveIds() error {
}) })
} }
if d.TenantId == "" { if d.TenantName != "" && d.TenantId == "" {
if err := d.initIdentity(); err != nil { if err := d.initIdentity(); err != nil {
return err return err
} }