Browse Source

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

tags/9.4.1
Zuul 1 week ago
parent
commit
d7a9f7edb7
1 changed files with 13 additions and 1 deletions
  1. 13
    1
      puppet/services/glance-api.yaml

+ 13
- 1
puppet/services/glance-api.yaml View File

@@ -224,6 +224,18 @@ conditions:
224 224
   glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']}
225 225
   service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
226 226
   cinder_backend_enabled: {equals: [{get_param: GlanceBackend}, cinder]}
227
+  glance_multiple_locations:
228
+    or:
229
+    - {equals : [{get_param: GlanceShowMultipleLocations}, true]}
230
+    - and:
231
+      # Keep this for compat, but ignore NovaEnableRbdBackend if it's a role param
232
+      - equals:
233
+        - get_param: GlanceBackend
234
+        - rbd
235
+      - equals:
236
+        - get_param: NovaEnableRbdBackend
237
+        - true
238
+
227 239
 
228 240
 resources:
229 241
 
@@ -280,7 +292,7 @@ outputs:
280 292
             glance::api::authtoken::project_domain_name: 'Default'
281 293
             glance::api::pipeline: 'keystone'
282 294
             glance::api::show_image_direct_url: true
283
-            glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
295
+            glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
284 296
             glance::api::os_region_name: {get_param: KeystoneRegion}
285 297
             glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
286 298
             glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}

Loading…
Cancel
Save