openstack/puppet-glance
Code Issues Proposed changes

Ensure [DEFAULT] show_multiple_locations is cleared

Browse Source 
The parameter was already deprecated, but it is still required in
some setup (eg. to leverage in-storage copy in a deployment with Ceph
used for cinder/glance).

Considering the parameter is still valid, this change ensures it is
removed by default, so that old value is properly removed from config
file.

Change-Id: I2477d5e271b017ee12546c67f4c3f3f9be89c062
(cherry picked from commit 5d977c750a)
(cherry picked from commit 8e7a4c46dd)
(cherry picked from commit af0063b34c)
This commit is contained in:
Takashi Kajinami
2022-04-25 18:26:29 +09:00
committed by Alan Bishop
parent f1ee98b833
commit 11b99bf088
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@@ -458,9 +458,9 @@ removed in a future realse. Use glance::api::db::database_max_overflow instead')
if $show_multiple_locations {
warning('The show_multiple_locations parameter is deprecated, and will be removed in a future release')
glance_api_config {
'DEFAULT/show_multiple_locations': value => $show_multiple_locations;
}
}
glance_api_config {
'DEFAULT/show_multiple_locations': value => pick($show_multiple_locations, $::os_service_default)
}
# task/taskflow_executor config.

1
spec/classes/glance_api_spec.rb
View File

@@ -17,6 +17,7 @@ describe 'glance::api' do
:backlog => '<SERVICE DEFAULT>',
:workers => '7',
:show_image_direct_url => '<SERVICE DEFAULT>',
:show_multiple_locations => '<SERVICE DEFAULT>',
:filesystem_store_metadata_file => '<SERVICE DEFAULT>',
:filesystem_store_file_perm => '<SERVICE DEFAULT>',
:location_strategy => '<SERVICE DEFAULT>',