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] aaa352a3af

Closes-Bug #1979232
Change-Id: Ib2f89a46d483f70c91e5fc444a84e968b79dae8e
(cherry picked from commit 0495848983)
This commit is contained in:
Takashi Kajinami 2022-06-22 13:55:41 +09:00
parent 62ad4d6a7c
commit 241f6c035f
1 changed files with 8 additions and 2 deletions

View File

@ -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;