From b1aaafa39b4ca721e8db15ec83f2ca58bd69c572 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 11 Sep 2023 10:43:27 +0900 Subject: [PATCH] Add [DEFAULT] lock_path to glance-cache.conf This option is required to access image data when cinder backend is used. Related-Bug: #2034893 Change-Id: Ic5e1d1c55fe31d48b8c9605beaabbc12446682dd --- manifests/api.pp | 2 +- spec/classes/glance_api_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/manifests/api.pp b/manifests/api.pp index 5c61b09a..90240fab 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -555,7 +555,7 @@ enabled_backends instead.') include glance::api::authtoken } - oslo::concurrency { 'glance_api_config': + oslo::concurrency { ['glance_api_config', 'glance_cache_config']: lock_path => $lock_path, } diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index 9b593cb9..e129d714 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -300,6 +300,9 @@ describe 'glance::api' do it { is_expected.to contain_oslo__concurrency('glance_api_config').with( :lock_path => platform_params[:lock_path] )} + it { is_expected.to contain_oslo__concurrency('glance_cache_config').with( + :lock_path => platform_params[:lock_path] + )} end describe 'with overridden oslo concurrency lock_path' do @@ -310,6 +313,9 @@ describe 'glance::api' do it { is_expected.to contain_oslo__concurrency('glance_api_config').with( :lock_path => '/glance/lock/path', )} + it { is_expected.to contain_oslo__concurrency('glance_cache_config').with( + :lock_path => '/glance/lock/path', + )} end describe 'setting enable_proxy_headers_parsing' do