The review[0] is merged, we should update other releated
puppet modules in order to fix ci.

[0]https://review.openstack.org/#/c/444248/

Change-Id: I1df5121f4fe03e2a9afc1fc43bf9d98d6c9a37fa
Closes-Bug: #1672362
This commit is contained in:
ZhongShengping 2017-03-13 21:29:41 +08:00
parent 31d276f8fe
commit 56322893db
1 changed files with 19 additions and 12 deletions

View File

@ -92,8 +92,10 @@ describe 'tacker' do
it 'configures rabbit' do
is_expected.to contain_tacker_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true)
is_expected.to contain_oslo__messaging__rabbit('tacker_config').with(
:rabbit_use_ssl => '<SERVICE DEFAULT>',
)
end
end
@ -108,26 +110,31 @@ describe 'tacker' do
end
it 'configures rabbit' do
is_expected.to contain_tacker_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/etc/ca.cert')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/etc/certfile')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/etc/key')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
is_expected.to contain_oslo__messaging__rabbit('tacker_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
end
context 'with rabbit ssl enabled without kombu' do
let :params do
{
:rabbit_use_ssl => true, }
:rabbit_use_ssl => true,
}
end
it 'configures rabbit' do
is_expected.to contain_tacker_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__messaging__rabbit('tacker_config').with(
:rabbit_use_ssl => true,
:kombu_ssl_ca_certs => '<SERVICE DEFAULT>',
:kombu_ssl_certfile => '<SERVICE DEFAULT>',
:kombu_ssl_keyfile => '<SERVICE DEFAULT>',
:kombu_ssl_version => '<SERVICE DEFAULT>',
)
end
end