openstack/python-cinderclient
Code Issues Proposed changes

Merge "cinderclient no longer honors --endpoint-type"

Browse Source
This commit is contained in:
Jenkins
2015-05-13 16:24:04 +00:00
committed by Gerrit Code Review
parent 24aff3b796 adc561a7b1
commit a15c74361c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cinderclient/shell.py
View File

@@ -701,7 +701,7 @@ class OpenStackCinderShell(object):
endpoint = keystone_adapter.get_endpoint( endpoint = keystone_adapter.get_endpoint(
service_type=service_type, service_type=service_type,
version=version, version=version,
interface='public') interface=endpoint_type)
# Service was found, but wrong version. Lets try a different # Service was found, but wrong version. Lets try a different
# version, if the user did not specify one. # version, if the user did not specify one.
@@ -713,7 +713,7 @@ class OpenStackCinderShell(object):
endpoint = keystone_adapter.get_endpoint( endpoint = keystone_adapter.get_endpoint(
service_type=service_type, version=version, service_type=service_type, version=version,
interface='public') interface=endpoint_type)
except keystoneclient_exc.EndpointNotFound as e: except keystoneclient_exc.EndpointNotFound as e:
# No endpoint found with that service_type, lets fall back to # No endpoint found with that service_type, lets fall back to
@@ -727,7 +727,7 @@ class OpenStackCinderShell(object):
try: try:
endpoint = keystone_adapter.get_endpoint( endpoint = keystone_adapter.get_endpoint(
version=version, version=version,
service_type=service_type, interface='public') service_type=service_type, interface=endpoint_type)
# Service was found, but wrong version. Lets try # Service was found, but wrong version. Lets try
# a different version, if the user did not specify one. # a different version, if the user did not specify one.
@@ -739,7 +739,7 @@ class OpenStackCinderShell(object):
endpoint = keystone_adapter.get_endpoint( endpoint = keystone_adapter.get_endpoint(
service_type=service_type, version=version, service_type=service_type, version=version,
interface='public') interface=endpoint_type)
except keystoneclient_exc.EndpointNotFound: except keystoneclient_exc.EndpointNotFound:
raise e raise e