diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-12 16:14:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-12 16:14:01 +0000 |
| commit | 377358bfd222902a81299c3ffedcd57b0b54dda5 (patch) | |
| tree | 07800bbbae9bee88bbbf8c374d980a891b0bc923 | |
| parent | 39e1057589f0c1747325659328d801232c2335cd (diff) | |
| parent | a251dc4c7ac7d5771dd73d3b2653d0ef0f6646e4 (diff) | |
| download | python-saharaclient-377358bfd222902a81299c3ffedcd57b0b54dda5.tar.gz | |
Merge "Added --bypass-url support for keystone 3"
| -rw-r--r-- | saharaclient/api/client.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/saharaclient/api/client.py b/saharaclient/api/client.py index 4ba1e97..bd20697 100644 --- a/saharaclient/api/client.py +++ b/saharaclient/api/client.py @@ -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, |