From 1954331d54090f1c9072cedee3a9f4110751eca2 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 14 Nov 2023 21:47:48 +0900 Subject: [PATCH] Do not hard-code default stores ... as is described in the parameter descriptions. Change-Id: Iabdf90bf6cf4cede7fe705032d5a65dabc69b8e2 --- manifests/init.pp | 4 ++-- spec/classes/zaqar_init_spec.rb | 2 ++ spec/classes/zaqar_management_mongodb_spec.rb | 1 + spec/classes/zaqar_messaging_mongodb_spec.rb | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 19cf69b..14e594d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -87,8 +87,8 @@ class zaqar( $subscription_pipeline = $facts['os_service_default'], $topic_pipeline = $facts['os_service_default'], $max_messages_post_size = $facts['os_service_default'], - $message_store = 'mongodb', - $management_store = 'mongodb', + $message_store = $facts['os_service_default'], + $management_store = $facts['os_service_default'], $package_name = $::zaqar::params::package_name, $package_ensure = 'present', Boolean $purge_config = false, diff --git a/spec/classes/zaqar_init_spec.rb b/spec/classes/zaqar_init_spec.rb index 493d1c2..8dd978f 100644 --- a/spec/classes/zaqar_init_spec.rb +++ b/spec/classes/zaqar_init_spec.rb @@ -39,6 +39,8 @@ describe 'zaqar' do is_expected.to contain_zaqar_config('storage/claim_pipeline').with_value('') is_expected.to contain_zaqar_config('storage/subscription_pipeline').with_value('') is_expected.to contain_zaqar_config('storage/topic_pipeline').with_value('') + is_expected.to contain_zaqar_config('drivers/message_store').with_value('') + is_expected.to contain_zaqar_config('drivers/management_store').with_value('') end end diff --git a/spec/classes/zaqar_management_mongodb_spec.rb b/spec/classes/zaqar_management_mongodb_spec.rb index ad203ea..ae03292 100644 --- a/spec/classes/zaqar_management_mongodb_spec.rb +++ b/spec/classes/zaqar_management_mongodb_spec.rb @@ -8,6 +8,7 @@ describe 'zaqar::management::mongodb' do password =>'foo', } class { 'zaqar': + management_store => 'mongodb', }" end diff --git a/spec/classes/zaqar_messaging_mongodb_spec.rb b/spec/classes/zaqar_messaging_mongodb_spec.rb index 54becd5..b44974d 100644 --- a/spec/classes/zaqar_messaging_mongodb_spec.rb +++ b/spec/classes/zaqar_messaging_mongodb_spec.rb @@ -8,6 +8,7 @@ describe 'zaqar::messaging::mongodb' do password =>'foo', } class { 'zaqar': + message_store => 'mongodb' }" end