Browse Source

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

tags/8.4.1
Zuul 2 weeks ago
parent
commit
7fbe83c398
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

@@ -200,18 +200,6 @@ 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
-
215 203
 
216 204
 resources:
217 205
 
@@ -268,7 +256,7 @@ outputs:
268 256
             glance::api::authtoken::project_domain_name: 'Default'
269 257
             glance::api::pipeline: 'keystone'
270 258
             glance::api::show_image_direct_url: true
271
-            glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
259
+            glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
272 260
             glance::api::os_region_name: {get_param: KeystoneRegion}
273 261
             glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
274 262
             glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}

Loading…
Cancel
Save