diff --git a/zun/common/clients.py b/zun/common/clients.py index 374ff983a..5a912c804 100644 --- a/zun/common/clients.py +++ b/zun/common/clients.py @@ -94,10 +94,12 @@ class OpenStackClients(object): if self._get_client_option('cinder', 'insecure'): session.verify = False cinder_api_version = self._get_client_option('cinder', 'api_version') + region_name = self._get_client_option('cinder', 'region_name') endpoint_type = self._get_client_option('cinder', 'endpoint_type') kwargs = { 'session': self.keystone().session, 'endpoint_type': endpoint_type, + 'region_name': region_name, 'cacert': self._get_client_option('cinder', 'ca_file'), 'insecure': self._get_client_option('cinder', 'insecure') } diff --git a/zun/conf/cinder_client.py b/zun/conf/cinder_client.py index ec5103573..ad9b7532c 100644 --- a/zun/conf/cinder_client.py +++ b/zun/conf/cinder_client.py @@ -25,6 +25,9 @@ common_security_opts = [ "be verified.")] cinder_client_opts = [ + cfg.StrOpt('region_name', + help='Region in Identity service catalog to use for ' + 'communication with the OpenStack service.'), cfg.StrOpt('endpoint_type', default='publicURL', help='Type of endpoint in Identity service catalog to use '