commit fa241d19ca5428c6c5c1db28fa30f1ddf1d43fa8
author Jenkins <jenkins@review.openstack.org> Fri Dec 14 23:31:19 2012 +0000
committer Gerrit Code Review <review@openstack.org> Fri Dec 14 23:31:19 2012 +0000
tree ae74fbef91b1b2469dca68def2e9466c4a6db6c8
parent 8527c8a168c2249ffa163f0baa940b9083d142c0
parent 86d51e36ca0f5772717d72d4729fb331a0066636

Merge "Fix smoke tests to delete resources synchronously."

tempest/common/rest_client.py

diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 8924fd3..cb18a9c 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -141,13 +141,7 @@
 
             mgmt_url = None
             for ep in auth_data['serviceCatalog']:
-                if ep["type"] == service and service != 'volume':
-                    mgmt_url = ep['endpoints'][self.region][self.endpoint_url]
-                    tenant_id = auth_data['token']['tenant']['id']
-                    break
-
-                elif (ep["type"] == service and ep['name'] == 'cinder' and
-                      service == 'volume'):
+                if ep["type"] == service:
                     mgmt_url = ep['endpoints'][self.region][self.endpoint_url]
                     tenant_id = auth_data['token']['tenant']['id']
                     break