openstack/puppet-swift
Code Issues Proposed changes

rabbitmq SSL: check puppet resource instead of actual config

Browse Source 
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: I60cc9bbe655d8dc7d08dd7a0d6466c7774b8f5a8
This commit is contained in:
Juan Antonio Osorio Robles
2017-03-10 13:47:48 +02:00
parent fb9e6dcecc
commit 1d0ba466e6
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@@ -65,13 +65,13 @@ describe 'swift::proxy::ceilometer' do
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/url').with_value('rabbit://user:pass@host:1234/virt').with_secret(true) } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/url').with_value('rabbit://user:pass@host:1234/virt').with_secret(true) }
end end
context 'with default SSL values' do it { is_expected.to contain_oslo__messaging__rabbit('swift_proxy_config').with(
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('<SERVICE DEFAULT>') } :rabbit_use_ssl => '<SERVICE DEFAULT>',
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>') } :kombu_ssl_ca_certs => '<SERVICE DEFAULT>',
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>') } :kombu_ssl_certfile => '<SERVICE DEFAULT>',
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>') } :kombu_ssl_keyfile => '<SERVICE DEFAULT>',
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE DEFAULT>') } :kombu_ssl_version => '<SERVICE DEFAULT>',
end )}
context 'with overriden rabbit ssl params' do context 'with overriden rabbit ssl params' do
before do before do
@@ -85,11 +85,13 @@ describe 'swift::proxy::ceilometer' do
}) })
end end
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/etc/ca.cert') } it { is_expected.to contain_oslo__messaging__rabbit('swift_proxy_config').with(
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/etc/certfile') } :rabbit_use_ssl => true,
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/etc/key') } :kombu_ssl_ca_certs => '/etc/ca.cert',
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') } :kombu_ssl_certfile => '/etc/certfile',
it { is_expected.to contain_swift_proxy_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') } :kombu_ssl_keyfile => '/etc/key',
:kombu_ssl_version => 'TLSv1',
)}
end end
end end