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
 		}