Merge "[Ussuri-Only] Fix hiera condition for cache_backend" into stable/ussuri
This commit is contained in:
commit
5ca3f9d3ce
|
@ -211,7 +211,8 @@ outputs:
|
|||
heat::cache::enabled: {get_param: EnableCache}
|
||||
heat::cache::tls_enabled: {get_param: MemcachedTLS}
|
||||
heat::cache::resource_finder_caching: false
|
||||
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'
|
||||
|
|
|
@ -507,10 +507,11 @@ outputs:
|
|||
-
|
||||
keystone::cache::enabled: {get_param: EnableCache}
|
||||
keystone::cache::tls_enabled: {get_param: MemcachedTLS}
|
||||
keystone::cache_backend:
|
||||
if:
|
||||
- tls_cache_enabled
|
||||
- keystone::cache::backend: 'dogpile.cache.pymemcache'
|
||||
- keystone::cache::backend: 'dogpile.cache.memcached'
|
||||
- 'dogpile.cache.pymemcache'
|
||||
- 'dogpile.cache.memcached'
|
||||
-
|
||||
if:
|
||||
- keystone_federation_enabled
|
||||
|
|
|
@ -357,10 +357,11 @@ outputs:
|
|||
- get_attr: [RoleParametersValue, value]
|
||||
- nova::cache::enabled: {get_param: EnableCache}
|
||||
nova::cache::tls_enabled: {get_param: MemcachedTLS}
|
||||
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…
Reference in New Issue