Browse Source

Merge "[Train-Only] Fix hiera condition for cache_backend" into stable/train

changes/90/822790/1
Zuul 5 months ago committed by Gerrit Code Review
parent
commit
7322a274bb
  1. 7
      deployment/heat/heat-base-puppet.yaml
  2. 9
      deployment/keystone/keystone-container-puppet.yaml
  3. 7
      deployment/nova/nova-base-puppet.yaml

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

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

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

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

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

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

Loading…
Cancel
Save