Browse Source

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

tags/11.2.0
Zuul 2 weeks ago
parent
commit
d514437721
1 changed files with 14 additions and 1 deletions
  1. 14
    1
      deployment/glance/glance-api-container-puppet.yaml

+ 14
- 1
deployment/glance/glance-api-container-puppet.yaml View File

@@ -247,6 +247,19 @@ conditions:
247 247
   service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
248 248
   glance_netapp_nfs_enabled: {equals : [{get_param: GlanceNetappNfsEnabled}, true]}
249 249
   glance_cache_enabled: {equals : [{get_param: GlanceCacheEnabled}, true]}
250
+  glance_multiple_locations:
251
+    or:
252
+    - {equals : [{get_param: GlanceShowMultipleLocations}, true]}
253
+    - glance_netapp_nfs_enabled
254
+    - and:
255
+      # Keep this for compat, but ignore NovaEnableRbdBackend if it's a role param
256
+      - equals:
257
+        - get_param: GlanceBackend
258
+        - rbd
259
+      - equals:
260
+        - get_param: NovaEnableRbdBackend
261
+        - true
262
+
250 263
 
251 264
 resources:
252 265
 
@@ -317,7 +330,7 @@ outputs:
317 330
               - 'keystone+cachemanagement'
318 331
               - 'keystone'
319 332
             glance::api::show_image_direct_url: true
320
-            glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
333
+            glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
321 334
             glance::api::os_region_name: {get_param: KeystoneRegion}
322 335
             glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
323 336
             glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}

Loading…
Cancel
Save