Browse Source

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

tags/10.6.1
Zuul 3 weeks ago
parent
commit
3151e73c29
1 changed files with 1 additions and 14 deletions
  1. 1
    14
      deployment/glance/glance-api-container-puppet.yaml

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

@@ -270,19 +270,6 @@ 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
-
286 273
 
287 274
 resources:
288 275
 
@@ -352,7 +339,7 @@ outputs:
352 339
               - 'keystone+cachemanagement'
353 340
               - 'keystone'
354 341
             glance::api::show_image_direct_url: true
355
-            glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
342
+            glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
356 343
             glance::api::os_region_name: {get_param: KeystoneRegion}
357 344
             glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
358 345
             glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}

Loading…
Cancel
Save