Merge "Add 'region_name' to cinder client config"

This commit is contained in:
Zuul 2019-07-02 02:30:01 +00:00 committed by Gerrit Code Review
commit 77f87bed35
2 changed files with 5 additions and 0 deletions

View File

@ -102,10 +102,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')
}

View File

@ -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 '