Browse Source

Do not forcibly enable Glance multiple locations for RBD backend

Use of show_multiple_locations in Glance should have been enabled
for the RBD backend only up to Mitaka.

Change-Id: I143d908bf1a5e55fff9a1c6833a978455eb15898
Closes-Bug: 1840138
(cherry picked from commit e8de3ae13d)
(cherry picked from commit 1058955adc)
tags/9.4.1
Giulio Fidente 2 months ago
parent
commit
d632cc3c4d
1 changed files with 1 additions and 13 deletions
  1. 1
    13
      puppet/services/glance-api.yaml

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

@@ -224,18 +224,6 @@ 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
-
239 227
 
240 228
 resources:
241 229
 
@@ -292,7 +280,7 @@ outputs:
292 280
             glance::keystone::authtoken::project_domain_name: 'Default'
293 281
             glance::api::pipeline: 'keystone'
294 282
             glance::api::show_image_direct_url: true
295
-            glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
283
+            glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
296 284
             glance::api::os_region_name: {get_param: KeystoneRegion}
297 285
             glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
298 286
             glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}

Loading…
Cancel
Save