openstack/puppet-heat
Code Issues Proposed changes

Cleanup rabbit ssl checks

Browse Source 
The checks for rabbitmq ssl parameters weren't removed
in commit with switching to oslo::messaging usage.
These check are already in oslo::messaging define,
so don't need to keep them in heat module anymore.

Remove unit test with strict requirement for setting
kombu_ssl_certfile and kombu_ssl_keyfile parameters
together as this isn't actually required in oslo messaging.

Change-Id: I822905723a07f5835202b4475944bffd206d8b86
This commit is contained in:
iberezovskiy 2016-04-20 19:56:41 +03:00
parent 47464bcda6
commit a70877902c
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/init.pp
View File

@ -294,21 +294,6 @@ class heat(
include ::heat::deps include ::heat::deps
include ::heat::params include ::heat::params
if !$rabbit_use_ssl or is_service_default(rabbit_use_ssl) {
if !is_service_default($kombu_ssl_ca_certs) {
fail('The kombu_ssl_ca_certs parameter requires rabbit_use_ssl to be set to true')
}
if !is_service_default($kombu_ssl_certfile) {
fail('The kombu_ssl_certfile parameter requires rabbit_use_ssl to be set to true')
}
if !is_service_default($kombu_ssl_keyfile) {
fail('The kombu_ssl_keyfile parameter requires rabbit_use_ssl to be set to true')
}
}
if ((!is_service_default($kombu_ssl_certfile)) and is_service_default($kombu_ssl_keyfile))
or ((!is_service_default($kombu_ssl_keyfile)) and is_service_default($kombu_ssl_certfile)) {
fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together')
}
if $mysql_module { if $mysql_module {
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.') warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
} }

14
spec/classes/heat_init_spec.rb
View File

@ -293,20 +293,6 @@ describe 'heat' do
before { params.merge!(:kombu_ssl_keyfile => '/path/to/ssl/keyfile')} before { params.merge!(:kombu_ssl_keyfile => '/path/to/ssl/keyfile')}
it_raises 'a Puppet::Error', /The kombu_ssl_keyfile parameter requires rabbit_use_ssl to be set to true/ it_raises 'a Puppet::Error', /The kombu_ssl_keyfile parameter requires rabbit_use_ssl to be set to true/
end end
context 'with kombu_ssl_certfile set to default and custom kombu_ssl_keyfile parameter' do
before { params.merge!(
:rabbit_use_ssl => true,
:kombu_ssl_keyfile => '/path/to/ssl/keyfile',
)}
it_raises 'a Puppet::Error', /The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together/
end
context 'with kombu_ssl_keyfile set to default and custom kombu_ssl_certfile parameter' do
before { params.merge!(
:rabbit_use_ssl => true,
:kombu_ssl_certfile => '/path/to/ssl/cert/file',
)}
it_raises 'a Puppet::Error', /The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together/
end
end end
end end