From d632cc3c4d96dab5360ece173a56bfc3ad5e26d7 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 14 Aug 2019 13:23:11 +0200 Subject: [PATCH] Do not forcibly enable Glance multiple locations for RBD backend Use of show_multiple_locations in Glance should have been enabled for the RBD backend only up to Mitaka. Change-Id: I143d908bf1a5e55fff9a1c6833a978455eb15898 Closes-Bug: 1840138 (cherry picked from commit e8de3ae13d48f940d8c1e0622b7285753032bbd9) (cherry picked from commit 1058955adc37ae8a8c2e39f744fef64844b6f25b) --- puppet/services/glance-api.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index 5b171ce34c..ada67ae07e 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -224,18 +224,6 @@ 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: @@ -292,7 +280,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: {if: [glance_multiple_locations, true, false]} + glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations} glance::api::os_region_name: {get_param: KeystoneRegion} glance::api::image_member_quota: {get_param: GlanceImageMemberQuota} glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}