Ensure [DEFAULT] show_multiple_locations is cleared
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
This commit is contained in:
parent
20fc020415
commit
5d977c750a
|
@ -435,9 +435,9 @@ glance::backend::multistore::cinder::cinder_os_region_name 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.
|
||||
|
|
|
@ -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>',
|
||||
|
|
Loading…
Reference in New Issue