From 7fc7c3a1c1c36cf8d88bbb40c42754323e845dde Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 5 Sep 2019 15:00:38 +0000 Subject: [PATCH] Revert "Do not forcibly enable Glance multiple locations for RBD backend" This reverts commit d632cc3c4d96dab5360ece173a56bfc3ad5e26d7. Change-Id: I516745e2b761b1a6c97dcf858800507dc921d11f Closes-Bug: 1842938 --- puppet/services/glance-api.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index ada67ae07e..5b171ce34c 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -224,6 +224,18 @@ conditions: glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']} service_debug_unset: {equals : [{get_param: GlanceDebug}, '']} cinder_backend_enabled: {equals: [{get_param: GlanceBackend}, cinder]} + glance_multiple_locations: + or: + - {equals : [{get_param: GlanceShowMultipleLocations}, true]} + - and: + # Keep this for compat, but ignore NovaEnableRbdBackend if it's a role param + - equals: + - get_param: GlanceBackend + - rbd + - equals: + - get_param: NovaEnableRbdBackend + - true + resources: @@ -280,7 +292,7 @@ outputs: glance::keystone::authtoken::project_domain_name: 'Default' glance::api::pipeline: 'keystone' glance::api::show_image_direct_url: true - glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations} + glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]} glance::api::os_region_name: {get_param: KeystoneRegion} glance::api::image_member_quota: {get_param: GlanceImageMemberQuota} glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}