From e8de3ae13d48f940d8c1e0622b7285753032bbd9 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 --- .../glance/glance-api-container-puppet.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 8f95302a02..0bb73b5b66 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -248,19 +248,6 @@ conditions: service_debug_unset: {equals : [{get_param: GlanceDebug}, '']} glance_netapp_nfs_enabled: {equals : [{get_param: GlanceNetappNfsEnabled}, true]} glance_cache_enabled: {equals : [{get_param: GlanceCacheEnabled}, true]} - glance_multiple_locations: - or: - - {equals : [{get_param: GlanceShowMultipleLocations}, true]} - - glance_netapp_nfs_enabled - - 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: @@ -331,7 +318,7 @@ outputs: - 'keystone+cachemanagement' - '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}