openstack
/
puppet-sahara
Code Issues Proposed changes

rabbitmq SSL: check puppet resource instead of actual config 

The configuration is done via the oslo::messaging::rabbit resource
from puppet-oslo. We should be checking for the resource that we're
using instead of the underlying configuration file.

Change-Id: I26dae32b3093d25544542243697273238a18b078
This commit is contained in:
Juan Antonio Osorio Robles 2017-03-10 13:47:48 +02:00
parent 11c245544c
commit 5cd94db931
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spec/classes/sahara_init_spec.rb
View File

@ -117,7 +117,6 @@ describe 'sahara' do
context 'with rabbit ssl cert parameters' do
before do
params.merge!({
:rabbit_password => 'pass',
:rabbit_use_ssl => true,
:kombu_ssl_ca_certs => '/etc/ca.cert',
:kombu_ssl_certfile => '/etc/certfile',
@ -125,27 +124,25 @@ describe 'sahara' do
:kombu_ssl_version => 'TLSv1',
})
end
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/etc/ca.cert') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/etc/certfile') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/etc/key') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') }
it { is_expected.to contain_oslo__messaging__rabbit('sahara_config').with(
:rabbit_use_ssl => true,
:kombu_ssl_ca_certs => '/etc/ca.cert',
:kombu_ssl_certfile => '/etc/certfile',
:kombu_ssl_keyfile => '/etc/key',
:kombu_ssl_version => 'TLSv1',
)}
end
context 'with rabbit ssl disabled' do
before do
params.merge!({
:rabbit_password => 'pass',
:rabbit_use_ssl => false,
})
end
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_oslo__messaging__rabbit('sahara_config').with(
:rabbit_use_ssl => false,
)}
end
context 'when passing params for single rabbit host' do