From 357e761bf7d4bafabe58967b752e40a3ef5bf853 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 8 Sep 2023 14:23:56 +0900
Subject: [PATCH] Fix legacy backend class usage with multi_store=false

Using legacy backend class (eg glance::backend::file) with multi_store
set to false(default) has been broken, because of duplicate declaration
of [glance_store] default_store option.

This fixes that problem.

Change-Id: Ibb12bdb8333fc91e2dc95c2c2cc4de79f2c82cc1
---
 manifests/api.pp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index 9cef33ca..2bebedab 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -460,13 +460,15 @@ enabled_backends instead.')
       $default_store_real = undef
     }
 
-    if $default_store_real and $multi_store {
-      glance_api_config {
-        'glance_store/default_store': value => $default_store_real;
-      }
-    } else {
-      glance_api_config {
-        'glance_store/default_store': ensure => absent;
+    if $multi_store {
+      if $default_store_real {
+        glance_api_config {
+          'glance_store/default_store': value => $default_store_real;
+        }
+      } else {
+        glance_api_config {
+          'glance_store/default_store': ensure => absent;
+        }
       }
     }