openstack
/
zun
Code Issues Proposed changes

Add 'region_name' to cinder client config 

This commit add 'region_name' to cinder_client config. It allows
operators to choose the region of the cinder endpoint to use.

Change-Id: I87958c59afea04a3687481ca3a19021db9c37877
This commit is contained in:
Hongbin Lu 2019-06-08 20:21:43 +00:00
parent d3d4b169a9
commit aee32d9406
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zun/common/clients.py
View File

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

3
zun/conf/cinder_client.py
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 '