Browse Source

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

tags/10.6.1
Zuul 1 week ago
parent
commit
7cd1dca6b7
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

@@ -270,6 +270,19 @@ conditions:
270 270
   service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
271 271
   glance_netapp_nfs_enabled: {equals : [{get_param: GlanceNetappNfsEnabled}, true]}
272 272
   glance_cache_enabled: {equals : [{get_param: GlanceCacheEnabled}, true]}
273
+  glance_multiple_locations:
274
+    or:
275
+    - {equals : [{get_param: GlanceShowMultipleLocations}, true]}
276
+    - glance_netapp_nfs_enabled
277
+    - and:
278
+      # Keep this for compat, but ignore NovaEnableRbdBackend if it's a role param
279
+      - equals:
280
+        - get_param: GlanceBackend
281
+        - rbd
282
+      - equals:
283
+        - get_param: NovaEnableRbdBackend
284
+        - true
285
+
273 286
 
274 287
 resources:
275 288
 
@@ -339,7 +352,7 @@ outputs:
339 352
               - 'keystone+cachemanagement'
340 353
               - 'keystone'
341 354
             glance::api::show_image_direct_url: true
342
-            glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
355
+            glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
343 356
             glance::api::os_region_name: {get_param: KeystoneRegion}
344 357
             glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
345 358
             glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}

Loading…
Cancel
Save