openstack/puppet-cinder
Code Issues Proposed changes

Merge "api: Clear ssl parameters when use_ssl is false"

Browse Source
This commit is contained in:
Zuul 2022-04-04 21:56:16 +00:00 committed by Gerrit Code Review
commit de9e54831d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@ -245,6 +245,12 @@ running as a standalone service, or httpd for being run by a httpd server")
'ssl/key_file' : value => $key_file; 'ssl/key_file' : value => $key_file;
'ssl/ca_file' : value => $ca_file; 'ssl/ca_file' : value => $ca_file;
} }
} else {
cinder_config {
'ssl/cert_file' : value => $::os_service_default;
'ssl/key_file' : value => $::os_service_default;
'ssl/ca_file' : value => $::os_service_default;
}
} }
if (!is_service_default($ratelimits)) { if (!is_service_default($ratelimits)) {

3
spec/classes/cinder_api_spec.rb
View File

@ -38,6 +38,9 @@ describe 'cinder::api' do
:enable_proxy_headers_parsing => '<SERVICE DEFAULT>', :enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
:max_request_body_size => '<SERVICE DEFAULT>', :max_request_body_size => '<SERVICE DEFAULT>',
) )
is_expected.to contain_cinder_config('ssl/ca_file').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('ssl/cert_file').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('ssl/key_file').with_value('<SERVICE DEFAULT>')
end end
end end