Use service catalog_type when getting the heat/glance clients
The 'orchestration' service_type is currently hard-coded when getting
the heat client but there is an orchestration.catalog_type config option
available, so use that rather than hard-code the value.
The same is true for the _get_image_client method and
CONF.image.catalog_type option, so fix that as well.
Change-Id: I6b4ba44619b9ddf99f063bc28c7c4bbae67408a8
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 9465545..840518a 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -112,7 +112,7 @@
region = CONF.identity.region
endpoint = self.identity_client.service_catalog.url_for(
attr='region', filter_value=region,
- service_type='image', endpoint_type='publicURL')
+ service_type=CONF.images.catalog_type, endpoint_type='publicURL')
dscv = CONF.identity.disable_ssl_certificate_validation
return glanceclient.Client('1', endpoint=endpoint, token=token,
insecure=dscv)
@@ -167,11 +167,12 @@
keystone = self._get_identity_client(username, password, tenant_name)
region = CONF.identity.region
token = keystone.auth_token
+ service_type = CONF.orchestration.catalog_type
try:
endpoint = keystone.service_catalog.url_for(
attr='region',
filter_value=region,
- service_type='orchestration',
+ service_type=service_type,
endpoint_type='publicURL')
except keystoneclient.exceptions.EndpointNotFound:
return None