From e9a86ec687da54901efc1bad20bfbcba6fc6ed04 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 16 Nov 2021 10:09:33 +0900 Subject: [PATCH] Add support for [storage] topic_pipeline Change-Id: Ia4e80a1e0365aeb9d8f010296c6391aa747d29ba --- manifests/init.pp | 7 +++++++ releasenotes/notes/topic_pipeline-f02c9b1f0f7d5d1a.yaml | 4 ++++ spec/classes/zaqar_init_spec.rb | 7 +++++++ 3 files changed, 18 insertions(+) create mode 100644 releasenotes/notes/topic_pipeline-f02c9b1f0f7d5d1a.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 5cebeb9..cfeb3f3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -42,6 +42,11 @@ # driver's controller methods. # Defaults to $::os_service_default. # +# [*topic_pipeline*] +# Pipeline to use for processing topic operations. This pipeline will be +# consumed before calling the strage driver's controller methods. +# Defaults to $::os_service_default. +# # [*max_messages_post_size*] # Defines the maximum size of message posts. (integer value) # Defaults to $::os_service_default. @@ -80,6 +85,7 @@ class zaqar( $message_pipeline = $::os_service_default, $claim_pipeline = $::os_service_default, $subscription_pipeline = $::os_service_default, + $topic_pipeline = $::os_service_default, $max_messages_post_size = $::os_service_default, $message_store = 'mongodb', $management_store = 'mongodb', @@ -114,6 +120,7 @@ class zaqar( 'storage/message_pipeline': value => join(any2array($message_pipeline), ','); 'storage/claim_pipeline': value => join(any2array($claim_pipeline), ','); 'storage/subscription_pipeline': value => join(any2array($subscription_pipeline), ','); + 'storage/topic_pipeline': value => join(any2array($topic_pipeline), ','); 'transport/max_messages_post_size': value => $max_messages_post_size; 'drivers/message_store': value => $message_store; 'drivers/management_store': value => $management_store; diff --git a/releasenotes/notes/topic_pipeline-f02c9b1f0f7d5d1a.yaml b/releasenotes/notes/topic_pipeline-f02c9b1f0f7d5d1a.yaml new file mode 100644 index 0000000..9d169b2 --- /dev/null +++ b/releasenotes/notes/topic_pipeline-f02c9b1f0f7d5d1a.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``zaqar::topic_pipeline`` parameter has been added. diff --git a/spec/classes/zaqar_init_spec.rb b/spec/classes/zaqar_init_spec.rb index 80d273e..07b1535 100644 --- a/spec/classes/zaqar_init_spec.rb +++ b/spec/classes/zaqar_init_spec.rb @@ -34,6 +34,11 @@ describe 'zaqar' do is_expected.to contain_zaqar_config('DEFAULT/auth_strategy').with( :value => 'keystone' ) + is_expected.to contain_zaqar_config('storage/queue_pipeline').with_value('') + is_expected.to contain_zaqar_config('storage/message_pipeline').with_value('') + 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('') end end @@ -48,6 +53,7 @@ describe 'zaqar' do :message_pipeline => 'zaqar_pipeline2', :claim_pipeline => 'zaqar_pipeline3', :subscription_pipeline => 'zaqar_pipeline4', + :topic_pipeline => 'zaqar_pipeline5', :max_messages_post_size => '1234', :message_store => 'swift', :management_store => 'sqlalchemy', @@ -62,6 +68,7 @@ describe 'zaqar' do is_expected.to contain_zaqar_config('storage/message_pipeline').with_value('zaqar_pipeline2') is_expected.to contain_zaqar_config('storage/claim_pipeline').with_value('zaqar_pipeline3') is_expected.to contain_zaqar_config('storage/subscription_pipeline').with_value('zaqar_pipeline4') + is_expected.to contain_zaqar_config('storage/topic_pipeline').with_value('zaqar_pipeline5') is_expected.to contain_zaqar_config('transport/max_messages_post_size').with_value('1234') is_expected.to contain_zaqar_config('drivers/message_store').with_value('swift') is_expected.to contain_zaqar_config('drivers/management_store').with_value('sqlalchemy')