openstack
/
puppet-magnum
Code Issues Proposed changes

Fix ci 

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: Ia1cdec50e62ad738742ecbe3ba3c50382d351fc4
Closes-Bug: #1672362
This commit is contained in:
ZhongShengping 2017-03-13 21:15:12 +08:00
parent c5fca41fc2
commit 9381a2280d
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
spec/classes/magnum_init_spec.rb
View File

@ -136,11 +136,13 @@ describe 'magnum' do
end
it 'configures rabbit' do
is_expected.to contain_magnum_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/etc/ca.cert')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/etc/certfile')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/etc/key')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
is_expected.to contain_oslo__messaging__rabbit('magnum_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
@ -152,11 +154,13 @@ describe 'magnum' do
end
it 'configures rabbit' do
is_expected.to contain_magnum_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE_DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE_DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE_DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE_DEFAULT>')
is_expected.to contain_oslo__messaging__rabbit('magnum_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
@ -169,11 +173,13 @@ describe 'magnum' do
end
it 'configures rabbit' do
is_expected.to contain_magnum_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE_DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE_DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE_DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE_DEFULT>')
is_expected.to contain_oslo__messaging__rabbit('magnum_config').with(
:rabbit_use_ssl => false,
:kombu_ssl_ca_certs => '<SERVICE DEFAULT>',
:kombu_ssl_certfile => '<SERVICE DEFAULT>',
:kombu_ssl_keyfile => '<SERVICE DEFAULT>',
:kombu_ssl_version => '<SERVICE DEFAULT>',
)
end
end