openstack/python-cinderclient
Code Issues Proposed changes

cinderclient does not honor --os-region-name or ENV[OS_REGION_NAME]

Browse Source 
When we use version discovery, we must pass in os-region-name for it
to work.

Change-Id: I82765f7a899d84283dd3a3672f6e151805c1c6fa
Fixes: bug 1467628
This commit is contained in:
scottda
2015-06-22 18:16:10 +00:00
parent f32684747f
commit a609eda7b4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinderclient/shell.py
View File

@@ -705,6 +705,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,
region_name=os_region_name,
interface=endpoint_type) interface=endpoint_type)
# Service was found, but wrong version. Lets try a different # Service was found, but wrong version. Lets try a different
@@ -717,6 +718,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,
region_name=os_region_name,
interface=endpoint_type) interface=endpoint_type)
except keystoneclient_exc.EndpointNotFound as e: except keystoneclient_exc.EndpointNotFound as e:
@@ -731,6 +733,7 @@ class OpenStackCinderShell(object):
try: try:
endpoint = keystone_adapter.get_endpoint( endpoint = keystone_adapter.get_endpoint(
version=version, version=version,
region_name=os_region_name,
service_type=service_type, interface=endpoint_type) service_type=service_type, interface=endpoint_type)
# Service was found, but wrong version. Lets try # Service was found, but wrong version. Lets try
@@ -743,6 +746,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,
region_name=os_region_name,
interface=endpoint_type) interface=endpoint_type)
except keystoneclient_exc.EndpointNotFound: except keystoneclient_exc.EndpointNotFound: