From 241f6c035f8e59840e6841f7d2a228a6c6790fad Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 22 Jun 2022 13:55:41 +0900 Subject: [PATCH] Fix duplicate resources This change fixes the duplicate resources between glance::api and glance::backend::file, which were caused by the new parameters added to the glance::backend::multistore::file defined type in [1]. [1] aaa352a3af310b184a3959da408ab5e9e7230eb2 Closes-Bug #1979232 Change-Id: Ib2f89a46d483f70c91e5fc444a84e968b79dae8e (cherry picked from commit 0495848983374b52ac2fa394e0ceb416cf2fac36) --- manifests/backend/multistore/file.pp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/manifests/backend/multistore/file.pp b/manifests/backend/multistore/file.pp index e71f6c56..8bbe74c9 100644 --- a/manifests/backend/multistore/file.pp +++ b/manifests/backend/multistore/file.pp @@ -70,13 +70,19 @@ define glance::backend::multistore::file( glance_api_config { "${name}/filesystem_store_datadir": value => $filesystem_store_datadir; "${name}/filesystem_store_datadirs": value => $filesystem_store_datadirs; - "${name}/filesystem_store_metadata_file": value => $filesystem_store_metadata_file; - "${name}/filesystem_store_file_perm": value => $filesystem_store_file_perm; "${name}/filesystem_store_chunk_size": value => $filesystem_store_chunk_size; "${name}/filesystem_thin_provisioning": value => $filesystem_thin_provisioning; "${name}/store_description": value => $store_description; } + if $name != 'glance_store' { + # NOTE(tkajinam): This logic is required to avoid conflict with glance::api + glance_api_config { + "${name}/filesystem_store_metadata_file": value => $filesystem_store_metadata_file; + "${name}/filesystem_store_file_perm": value => $filesystem_store_file_perm; + } + } + glance_cache_config { "${name}/filesystem_store_datadir": value => $filesystem_store_datadir; "${name}/filesystem_store_datadirs": value => $filesystem_store_datadirs;