openstack/python-saharaclient
Code Issues Proposed changes

Merge "Added --bypass-url support for keystone 3"

Browse Source
This commit is contained in:
Jenkins
2015-02-12 16:14:01 +00:00
committed by Gerrit Code Review
parent 39e1057589 a251dc4c7a
commit 377358bfd2
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
saharaclient/api/client.py
View File

@@ -54,17 +54,18 @@ class Client(object):
service_name=service_name,
region_name=region_name)
input_auth_token = keystone.session.get_token(auth)
try:
sahara_catalog_url = keystone.session.get_endpoint(
auth, interface=endpoint_type,
service_type=service_type)
except kex.EndpointNotFound:
# This is support of 'data_processing' service spelling
# which was used for releases before Kilo
service_type = service_type.replace('-', '_')
sahara_catalog_url = keystone.session.get_endpoint(
auth, interface=endpoint_type,
service_type=service_type)
if not sahara_catalog_url:
try:
sahara_catalog_url = keystone.session.get_endpoint(
auth, interface=endpoint_type,
service_type=service_type)
except kex.EndpointNotFound:
# This is support of 'data_processing' service spelling
# which was used for releases before Kilo
service_type = service_type.replace('-', '_')
sahara_catalog_url = keystone.session.get_endpoint(
auth, interface=endpoint_type,
service_type=service_type)
else:
keystone = self.get_keystone_client(
username=username,