Revert "Do not forcibly enable Glance multiple locations for RBD backend"

This reverts commit 0c672e496a.

Change-Id: Ic96103fd7c687186bb53dadac0269eb2d8cade45
Closes-Bug: 1842938

puppet/services/glance-api.yaml

@@ -200,6 +200,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:
 
@@ -256,7 +268,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}