openstack/puppet-trove
Code Issues Proposed changes

api: move SSL parameters under [ssl] section

Browse Source 
Move SSL parameters under [ssl] section, like it should be done when
using Oslo Service.

Change-Id: I5ae991970f949dd9cfe2948b829ba5bb9834423c
This commit is contained in:
Emilien Macchi 2016-03-31 16:07:23 -04:00
parent 683c303f94
commit 80cf1085e2
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api.pp
View File

@ -283,29 +283,29 @@ class trove::api(
# SSL Options # SSL Options
if $cert_file { if $cert_file {
trove_config { trove_config {
'DEFAULT/cert_file' : value => $cert_file; 'ssl/cert_file' : value => $cert_file;
} }
} else { } else {
trove_config { trove_config {
'DEFAULT/cert_file': ensure => absent; 'ssl/cert_file': ensure => absent;
} }
} }
if $key_file { if $key_file {
trove_config { trove_config {
'DEFAULT/key_file' : value => $key_file; 'ssl/key_file' : value => $key_file;
} }
} else { } else {
trove_config { trove_config {
'DEFAULT/key_file': ensure => absent; 'ssl/key_file': ensure => absent;
} }
} }
if $ca_file { if $ca_file {
trove_config { trove_config {
'DEFAULT/ca_file' : value => $ca_file; 'ssl/ca_file' : value => $ca_file;
} }
} else { } else {
trove_config { trove_config {
'DEFAULT/ca_file': ensure => absent; 'ssl/ca_file': ensure => absent;
} }
} }

19
spec/classes/trove_api_spec.rb
View File

@ -91,6 +91,9 @@ describe 'trove::api' do
is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false)
is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>') is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false) is_expected.to contain_trove_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false)
is_expected.to contain_trove_config('ssl/cert_file').with_ensure('absent')
is_expected.to contain_trove_config('ssl/key_file').with_ensure('absent')
is_expected.to contain_trove_config('ssl/ca_file').with_ensure('absent')
end end
context 'with deprecated parameters' do context 'with deprecated parameters' do
@ -114,6 +117,22 @@ describe 'trove::api' do
end end
end end
context 'with SSL enabled on API' do
before :each do
params.merge!(
:cert_file => 'cert',
:key_file => 'key',
:ca_file => 'ca',
)
end
it 'contains ssl parameters' do
is_expected.to contain_trove_config('ssl/cert_file').with_value('cert')
is_expected.to contain_trove_config('ssl/key_file').with_value('key')
is_expected.to contain_trove_config('ssl/ca_file').with_value('ca')
end
end
context 'with overridden rate limit parameters' do context 'with overridden rate limit parameters' do
before :each do before :each do
params.merge!( params.merge!(