openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-09-06 18:11:25 +00:00 committed by Gerrit Code Review
parent cc65c180d5 f3c9487b61
commit 7cd1dca6b7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deployment/glance/glance-api-container-puppet.yaml
View File

@ -270,6 +270,19 @@ conditions:
service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
glance_netapp_nfs_enabled: {equals : [{get_param: GlanceNetappNfsEnabled}, true]}
glance_cache_enabled: {equals : [{get_param: GlanceCacheEnabled}, true]}
glance_multiple_locations:
or:
- {equals : [{get_param: GlanceShowMultipleLocations}, true]}
- glance_netapp_nfs_enabled
- and:
# Keep this for compat, but ignore NovaEnableRbdBackend if it's a role param
- equals:
- get_param: GlanceBackend
- rbd
- equals:
- get_param: NovaEnableRbdBackend
- true
resources:
@ -339,7 +352,7 @@ outputs:
- 'keystone+cachemanagement'
- 'keystone'
glance::api::show_image_direct_url: true
glance::api::show_multiple_locations: {get_param: GlanceShowMultipleLocations}
glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
glance::api::os_region_name: {get_param: KeystoneRegion}
glance::api::image_member_quota: {get_param: GlanceImageMemberQuota}
glance::api::enabled_import_methods: {get_param: GlanceEnabledImportMethods}