Merge "Do not forcibly enable Glance multiple locations for RBD backend" into stable/stein

deployment/glance/glance-api-container-puppet.yaml

@@ -270,19 +270,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:
 
@@ -352,7 +339,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}