From adc561a7b12e687420a5785eacb246aacba2b6e4 Mon Sep 17 00:00:00 2001 From: scottda Date: Tue, 12 May 2015 21:34:13 +0000 Subject: [PATCH] cinderclient no longer honors --endpoint-type Commit for "Enable version discovery": ae03d2a721bd9acb61805ce792a27fb7cf88e5cd breaks CLI use of --endpoint-type. This is because we were using the default interface instead of checking to see if an endpoint_type is passed in. Change-Id: I412bb6b4bcb9bf10aa6118a2ed43e28cbd3ed236 Closes-Bug: 1454407 --- cinderclient/shell.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cinderclient/shell.py b/cinderclient/shell.py index da562e10f..95b3a7f96 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -694,7 +694,7 @@ class OpenStackCinderShell(object): endpoint = keystone_adapter.get_endpoint( service_type=service_type, version=version, - interface='public') + interface=endpoint_type) # Service was found, but wrong version. Lets try a different # version, if the user did not specify one. @@ -706,7 +706,7 @@ class OpenStackCinderShell(object): endpoint = keystone_adapter.get_endpoint( service_type=service_type, version=version, - interface='public') + interface=endpoint_type) except keystoneclient_exc.EndpointNotFound as e: # No endpoint found with that service_type, lets fall back to @@ -720,7 +720,7 @@ class OpenStackCinderShell(object): try: endpoint = keystone_adapter.get_endpoint( version=version, - service_type=service_type, interface='public') + service_type=service_type, interface=endpoint_type) # Service was found, but wrong version. Lets try # a different version, if the user did not specify one. @@ -732,7 +732,7 @@ class OpenStackCinderShell(object): endpoint = keystone_adapter.get_endpoint( service_type=service_type, version=version, - interface='public') + interface=endpoint_type) except keystoneclient_exc.EndpointNotFound: raise e