Browse Source

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

tags/8.4.1^0
Zuul 1 week ago
parent
commit
80a67e6c8f
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

@@ -200,6 +200,18 @@ conditions:
200 200
   glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']}
201 201
   service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
202 202
   cinder_backend_enabled: {equals: [{get_param: GlanceBackend}, cinder]}
203
+  glance_multiple_locations:
204
+    or:
205
+    - {equals : [{get_param: GlanceShowMultipleLocations}, true]}
206
+    - and:
207
+      # Keep this for compat, but ignore NovaEnableRbdBackend if it's a role param
208
+      - equals:
209
+        - get_param: GlanceBackend
210
+        - rbd
211
+      - equals:
212
+        - get_param: NovaEnableRbdBackend
213
+        - true
214
+
203 215
 
204 216
 resources:
205 217
 
@@ -256,7 +268,7 @@ outputs:
256 268
             glance::api::authtoken::project_domain_name: 'Default'
257 269
             glance::api::pipeline: 'keystone'
258 270
             glance::api::show_image_direct_url: true
259
-            glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
271
+            glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
260 272
             glance::api::os_region_name: {get_param: KeystoneRegion}
261 273
             glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
262 274
             glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}

Loading…
Cancel
Save