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: I0388341b0129ae0ad9fa80f88aeb120395aaa176
Closes-Bug: #1672362
This commit is contained in:
ZhongShengping 2017-03-13 20:49:01 +08:00
parent 7a0c3d0316
commit 32583dd8e6
1 changed files with 17 additions and 11 deletions

View File

@ -107,8 +107,10 @@ describe 'cloudkitty' do
it 'configures rabbit' do
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true)
is_expected.to contain_oslo__messaging__rabbit('cloudkitty_config').with(
:rabbit_use_ssl => '<SERVICE DEFAULT>',
)
end
end
@ -122,11 +124,13 @@ describe 'cloudkitty' do
end
it 'configures rabbit' do
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/etc/ca.cert')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/etc/certfile')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/etc/key')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
is_expected.to contain_oslo__messaging__rabbit('cloudkitty_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
@ -136,11 +140,13 @@ describe 'cloudkitty' do
end
it 'configures rabbit' do
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__messaging__rabbit('cloudkitty_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