openstack/puppet-trove
Code Issues Proposed changes

Refactor handling of ssl options

Browse Source 
Change-Id: I95d518e6ea9440736fc1a63135850c6a2d990a61
This commit is contained in:
Takashi Kajinami
2024-03-13 10:55:42 +09:00
parent b816669b3e
commit e6afe1f62f
3 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
manifests/api.pp
View File

@@ -113,9 +113,9 @@ class trove::api(
$workers = $facts['os_workers'], $workers = $facts['os_workers'],
Boolean $enabled = true, Boolean $enabled = true,
Boolean $purge_config = false, Boolean $purge_config = false,
$cert_file = false, $cert_file = $facts['os_service_default'],
$key_file = false, $key_file = $facts['os_service_default'],
$ca_file = false, $ca_file = $facts['os_service_default'],
$http_get_rate = $facts['os_service_default'], $http_get_rate = $facts['os_service_default'],
$http_post_rate = $facts['os_service_default'], $http_post_rate = $facts['os_service_default'],
$http_put_rate = $facts['os_service_default'], $http_put_rate = $facts['os_service_default'],
@@ -142,34 +142,11 @@ class trove::api(
include trove::keystone::authtoken include trove::keystone::authtoken
} }
# SSL Options
if $cert_file {
trove_config { trove_config {
'ssl/cert_file': value => $cert_file; 'ssl/cert_file': value => $cert_file;
}
} else {
trove_config {
'ssl/cert_file': ensure => absent;
}
}
if $key_file {
trove_config {
'ssl/key_file': value => $key_file; 'ssl/key_file': value => $key_file;
}
} else {
trove_config {
'ssl/key_file': ensure => absent;
}
}
if $ca_file {
trove_config {
'ssl/ca_file': value => $ca_file; 'ssl/ca_file': value => $ca_file;
} }
} else {
trove_config {
'ssl/ca_file': ensure => absent;
}
}
# rate limits # rate limits
trove_config { trove_config {

9
releasenotes/notes/refacotr-ssl-opts-bff4682538e62acb.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
upgrade:
- |
The following parameters of the ``trove`` class no longer treat ``false``
as an indicator to remove the option. Use os_service_default fact instead.
- ``ca_file``
- ``cert_file``
- ``key_file``

6
spec/classes/trove_api_spec.rb
View File

@@ -73,9 +73,9 @@ describe 'trove::api' do
is_expected.to contain_trove_config('DEFAULT/http_delete_rate').with_value('<SERVICE DEFAULT>') is_expected.to contain_trove_config('DEFAULT/http_delete_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/http_mgmt_post_rate').with_value('<SERVICE DEFAULT>') is_expected.to contain_trove_config('DEFAULT/http_mgmt_post_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/taskmanager_queue').with_value('<SERVICE DEFAULT>') is_expected.to contain_trove_config('DEFAULT/taskmanager_queue').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('ssl/cert_file').with_ensure('absent') is_expected.to contain_trove_config('ssl/cert_file').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('ssl/key_file').with_ensure('absent') is_expected.to contain_trove_config('ssl/key_file').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('ssl/ca_file').with_ensure('absent') is_expected.to contain_trove_config('ssl/ca_file').with_value('<SERVICE DEFAULT>')
end end
context 'with SSL enabled on API' do context 'with SSL enabled on API' do