openstack/puppet-vitrage
Code Issues Proposed changes

Fix rpc_backend option warning and test failed

Browse Source 
1) The value of rpc_backend option is 'rabbit', not $::os_service_default.
so fix the if statement condition.
2) Fix unit test.

Closes-Bug: #1708976

Change-Id: Ie407c576f8f45856f63bd843f3c7b88876683f5a
This commit is contained in:
ZhongShengping 2017-08-07 09:59:33 +08:00
parent 182ca337f5
commit e5f1e917b6
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -253,7 +253,7 @@ class vitrage (
include ::vitrage::deps include ::vitrage::deps
include ::vitrage::logging include ::vitrage::logging
if !is_service_default($rpc_backend) { if $rpc_backend {
warning("vitrage::rpc_backend is deprecated. Please use \ warning("vitrage::rpc_backend is deprecated. Please use \
vitrage::default_transport_url instead.") vitrage::default_transport_url instead.")
} }

2
spec/classes/vitrage_init_spec.rb
View File

@ -26,7 +26,6 @@ describe 'vitrage' do
end end
it 'configures rabbit' do it 'configures rabbit' do
is_expected.to contain_vitrage_config('DEFAULT/rpc_backend').with_value('rabbit')
is_expected.to contain_vitrage_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>') is_expected.to contain_vitrage_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>') is_expected.to contain_vitrage_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>') is_expected.to contain_vitrage_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
@ -68,7 +67,6 @@ describe 'vitrage' do
end end
it 'configures rabbit' do it 'configures rabbit' do
is_expected.to contain_vitrage_config('DEFAULT/rpc_backend').with_value('rabbit')
is_expected.to contain_vitrage_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') is_expected.to contain_vitrage_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673')
is_expected.to contain_vitrage_config('DEFAULT/rpc_response_timeout').with_value('120') is_expected.to contain_vitrage_config('DEFAULT/rpc_response_timeout').with_value('120')
is_expected.to contain_vitrage_config('DEFAULT/control_exchange').with_value('vitrage') is_expected.to contain_vitrage_config('DEFAULT/control_exchange').with_value('vitrage')