openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[Victoria-Only] Fix hiera condition for cache_backend" into stable/victoria

This commit is contained in:
Zuul 2021-12-28 17:05:04 +00:00 committed by Gerrit Code Review
parent 4883007627 b5d65342a7
commit e05d66b806
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/heat/heat-base-puppet.yaml
View File

@ -211,7 +211,8 @@ outputs:
heat::cache::enabled: {get_param: EnableCache} heat::cache::enabled: {get_param: EnableCache}
heat::cache::tls_enabled: {get_param: MemcachedTLS} heat::cache::tls_enabled: {get_param: MemcachedTLS}
heat::cache::resource_finder_caching: false heat::cache::resource_finder_caching: false
if: heat::cache::backend:
if:
- tls_cache_enabled - tls_cache_enabled
- heat::cache::backend: 'dogpile.cache.pymemcache' - 'dogpile.cache.pymemcache'
- heat::cache::backend: 'dogpile.cache.memcached' - 'dogpile.cache.memcached'

9
deployment/keystone/keystone-container-puppet.yaml
View File

@ -499,10 +499,11 @@ outputs:
- -
keystone::cache::enabled: {get_param: EnableCache} keystone::cache::enabled: {get_param: EnableCache}
keystone::cache::tls_enabled: {get_param: MemcachedTLS} keystone::cache::tls_enabled: {get_param: MemcachedTLS}
if: keystone::cache_backend:
- tls_cache_enabled if:
- keystone::cache::backend: 'dogpile.cache.pymemcache' - tls_cache_enabled
- keystone::cache::backend: 'dogpile.cache.memcached' - 'dogpile.cache.pymemcache'
- 'dogpile.cache.memcached'
- -
if: if:
- keystone_federation_enabled - keystone_federation_enabled

7
deployment/nova/nova-base-puppet.yaml
View File

@ -357,10 +357,11 @@ outputs:
- get_attr: [RoleParametersValue, value] - get_attr: [RoleParametersValue, value]
- nova::cache::enabled: {get_param: EnableCache} - nova::cache::enabled: {get_param: EnableCache}
nova::cache::tls_enabled: {get_param: MemcachedTLS} nova::cache::tls_enabled: {get_param: MemcachedTLS}
if: nova::cache::backend:
if:
- tls_cache_enabled - tls_cache_enabled
- nova::cache::backend: 'dogpile.cache.pymemcache' - 'dogpile.cache.pymemcache'
- nova::cache::backend: 'dogpile.cache.memcached' - 'dogpile.cache.memcached'
- if: - if:
- compute_upgrade_level_empty - compute_upgrade_level_empty
- {} - {}