From e5f1e917b6a8f7f6b9827ac419b5a846e60e7451 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 7 Aug 2017 09:59:33 +0800 Subject: [PATCH] Fix rpc_backend option warning and test failed 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 --- manifests/init.pp | 2 +- spec/classes/vitrage_init_spec.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 577a0d7..6efa6d0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -253,7 +253,7 @@ class vitrage ( include ::vitrage::deps include ::vitrage::logging - if !is_service_default($rpc_backend) { + if $rpc_backend { warning("vitrage::rpc_backend is deprecated. Please use \ vitrage::default_transport_url instead.") } diff --git a/spec/classes/vitrage_init_spec.rb b/spec/classes/vitrage_init_spec.rb index f5f39cd..20d3f0a 100644 --- a/spec/classes/vitrage_init_spec.rb +++ b/spec/classes/vitrage_init_spec.rb @@ -26,7 +26,6 @@ describe 'vitrage' do end 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('') is_expected.to contain_vitrage_config('DEFAULT/rpc_response_timeout').with_value('') is_expected.to contain_vitrage_config('DEFAULT/control_exchange').with_value('') @@ -68,7 +67,6 @@ describe 'vitrage' do end 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/rpc_response_timeout').with_value('120') is_expected.to contain_vitrage_config('DEFAULT/control_exchange').with_value('vitrage')