From 33492bfc70a22e3aed766556e1fdd3e93905bfe9 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 15 Feb 2024 00:01:24 +0900 Subject: [PATCH] Support [queue] asynchronous_workers option ... which determines number of processes launched in barbican-worker. Change-Id: Ia31a7d440ba3102afa7b5972fe893cfb4f1817a1 --- manifests/worker.pp | 9 +++++++ ...bican-worker_workers-3a0a5344c5290df5.yaml | 4 +++ spec/classes/barbican_worker_spec.rb | 25 +++++++++++-------- 3 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/barbican-worker_workers-3a0a5344c5290df5.yaml diff --git a/manifests/worker.pp b/manifests/worker.pp index 9e2c9b97..ad3b77a2 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -33,10 +33,15 @@ # (Optional) Whether to enable the barbican-worker service. # Defaults to true # +# [*workers*] +# (Optional) Number of asynchronous worker process. +# Defaults to $facts['os_service_default'] +# class barbican::worker ( $package_ensure = 'present', Boolean $manage_service = true, Boolean $enabled = true, + $workers = $facts['os_service_default'], ) inherits barbican::params { include barbican::deps @@ -47,6 +52,10 @@ class barbican::worker ( tag => ['openstack', 'barbican-package'], } + barbican_config { + 'queue/asynchronous_workers': value => $workers; + } + if $manage_service { if $enabled { $service_ensure = 'running' diff --git a/releasenotes/notes/barbican-worker_workers-3a0a5344c5290df5.yaml b/releasenotes/notes/barbican-worker_workers-3a0a5344c5290df5.yaml new file mode 100644 index 00000000..f5b9a5e5 --- /dev/null +++ b/releasenotes/notes/barbican-worker_workers-3a0a5344c5290df5.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``barbican::worker::workers`` parameter has been added. diff --git a/spec/classes/barbican_worker_spec.rb b/spec/classes/barbican_worker_spec.rb index 92304006..f473e6aa 100644 --- a/spec/classes/barbican_worker_spec.rb +++ b/spec/classes/barbican_worker_spec.rb @@ -19,10 +19,6 @@ require 'spec_helper' describe 'barbican::worker' do - let :params do - {} - end - shared_examples 'barbican::worker' do context 'with default parameters' do it { should contain_package('barbican-worker').with( @@ -31,6 +27,8 @@ describe 'barbican::worker' do :tag => ['openstack', 'barbican-package'] )} + it { should contain_barbican_config('queue/asynchronous_workers').with_value('') } + it { should contain_service('barbican-worker').with( :ensure => 'running', :name => platform_params[:worker_service_name], @@ -41,17 +39,24 @@ describe 'barbican::worker' do )} end + context 'with parameters' do + let :params do + { :workers => 2 } + end + it { should contain_barbican_config('queue/asynchronous_workers').with_value(2) } + end + context 'with package_ensure set to absent' do - before do - params.merge!( :package_ensure => 'absent' ) + let :params do + { :package_ensure => 'absent' } end it { should contain_package('barbican-worker').with_ensure('absent') } end context 'with manage_service set to false' do - before do - params.merge!( :manage_service => false ) + let :params do + { :manage_service => false } end it { should contain_package('barbican-worker').with_ensure('present') } @@ -59,8 +64,8 @@ describe 'barbican::worker' do end context 'with enabled set to false' do - before do - params.merge!( :enabled => false ) + let :params do + { :enabled => false } end it { should contain_package('barbican-worker').with_ensure('present') }