From 3c2aab2abeb50dab611b6e88cfaf07381662b282 Mon Sep 17 00:00:00 2001
From: Ash Wilson <ash.wilson@rackspace.com>
Date: Mon, 11 Jan 2016 13:45:42 -0500
Subject: [PATCH] Only derive tenant ID if tenant name is supplied.

The Rackspace provider authenticates with username and API key rather than
tenant name or ID.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
---
 drivers/openstack/openstack.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go
index 001b7c721b..8c89f9f0d8 100644
--- a/drivers/openstack/openstack.go
+++ b/drivers/openstack/openstack.go
@@ -566,7 +566,7 @@ func (d *Driver) resolveIds() error {
 		})
 	}
 
-	if d.TenantId == "" {
+	if d.TenantName != "" && d.TenantId == "" {
 		if err := d.initIdentity(); err != nil {
 			return err
 		}