From 11b99bf0882c11b204bdcdc89a727ce8e5159b4b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 25 Apr 2022 18:26:29 +0900
Subject: [PATCH] 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
(cherry picked from commit 5d977c750acf5276ce7fb7772436e9e74c2be001)
(cherry picked from commit 8e7a4c46dd474b5bee8ba1b5fb1e62f5b6bf4e5e)
(cherry picked from commit af0063b34c8d4041e9690d658ea9f0db2e07aca0)
---
 manifests/api.pp                | 6 +++---
 spec/classes/glance_api_spec.rb | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index 397c70a5..55804f43 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -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.
diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb
index 5c206bac..1ca02530 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -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>',