openstack/cinder
Code Issues Proposed changes

Merge "Support mTLS when calling the glance API"

Browse Source
This commit is contained in:
Zuul 2021-03-25 03:26:29 +00:00 committed by Gerrit Code Review
commit 47cdd944b3
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/common/config.py
View File

@ -191,6 +191,12 @@ image_opts = [
cfg.StrOpt('glance_ca_certificates_file', cfg.StrOpt('glance_ca_certificates_file',
help='Location of ca certificates file to use for glance ' help='Location of ca certificates file to use for glance '
'client requests.'), 'client requests.'),
cfg.StrOpt('glance_certfile',
help='Location of certificate file to use for glance '
'client requests.'),
cfg.StrOpt('glance_keyfile',
help='Location of certificate key file to use for glance '
'client requests.'),
cfg.IntOpt('glance_request_timeout', cfg.IntOpt('glance_request_timeout',
help='http/https timeout value for glance operations. If no ' help='http/https timeout value for glance operations. If no '
'value (None) is supplied here, the glanceclient default ' 'value (None) is supplied here, the glanceclient default '

2
cinder/image/glance.py
View File

@ -120,6 +120,8 @@ def _create_glance_client(context, netloc, use_ssl):
config_options = {'insecure': CONF.glance_api_insecure, config_options = {'insecure': CONF.glance_api_insecure,
'cacert': CONF.glance_ca_certificates_file, 'cacert': CONF.glance_ca_certificates_file,
'timeout': CONF.glance_request_timeout, 'timeout': CONF.glance_request_timeout,
'cert': CONF.glance_certfile,
'key': CONF.glance_keyfile,
'split_loggers': CONF.split_loggers 'split_loggers': CONF.split_loggers
} }
_SESSION = ks_session.Session().load_from_options(**config_options) _SESSION = ks_session.Session().load_from_options(**config_options)

6
cinder/tests/unit/image/test_glance.py
View File

@ -1108,6 +1108,8 @@ class TestGlanceImageServiceClient(test.TestCase):
config_options = {'insecure': False, config_options = {'insecure': False,
'cacert': None, 'cacert': None,
'key': None,
'cert': None,
'timeout': None, 'timeout': None,
'split_loggers': False} 'split_loggers': False}
@ -1129,6 +1131,8 @@ class TestGlanceImageServiceClient(test.TestCase):
self.flags(glance_request_timeout=60) self.flags(glance_request_timeout=60)
self.flags( self.flags(
glance_ca_certificates_file='/opt/stack/data/ca-bundle.pem') glance_ca_certificates_file='/opt/stack/data/ca-bundle.pem')
self.flags(glance_certfile='/opt/stack/data/cert.pem')
self.flags(glance_keyfile='/opt/stack/data/key.pem')
class MyGlanceStubClient(object): class MyGlanceStubClient(object):
def __init__(inst, version, *args, **kwargs): def __init__(inst, version, *args, **kwargs):
@ -1140,6 +1144,8 @@ class TestGlanceImageServiceClient(test.TestCase):
config_options = {'insecure': False, config_options = {'insecure': False,
'cacert': '/opt/stack/data/ca-bundle.pem', 'cacert': '/opt/stack/data/ca-bundle.pem',
'cert': '/opt/stack/data/cert.pem',
'key': '/opt/stack/data/key.pem',
'timeout': 60, 'timeout': 60,
'split_loggers': False} 'split_loggers': False}