openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix some template conditions

Browse Source 
Regressions from Ic77ed56c32c7071ce126a1528030094b97894653
and I685ec7d7c583c9f8d9f04b0f1027136ed042487c.
'if' can't be used for a key in a map. If specified for
a value the key would be ignored.

Change-Id: I0ed0d6657622100480721f7e4ca14e39944ce292
This commit is contained in:
ramishra 2021-04-06 15:19:27 +05:30
parent 3ed29643b9
commit 95bc75aaf2
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/heat/heat-api-cfn-container-puppet.yaml
View File

@ -141,9 +141,9 @@ outputs:
"%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiCfnNetwork]}
if:
- heat_workers_set
- heat::wsgi::apache_api_cfn::workers: {get_param: HeatWorkers}
- if:
- heat_workers_set
- heat::wsgi::apache_api_cfn::workers: {get_param: HeatWorkers}
service_config_settings:
rsyslog:
tripleo_logging_sources_heat_api_cfn:

2
deployment/heat/heat-api-container-puppet.yaml
View File

@ -171,7 +171,7 @@ outputs:
"%{hiera('fqdn_$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HeatApiNetwork]}
if:
- if:
- heat_workers_set
- heat::wsgi::apache_api::workers: {get_param: HeatWorkers}
service_config_settings:

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

@ -151,8 +151,7 @@ outputs:
service_name: heat_base
config_settings:
map_merge:
-
if:
- if:
- cors_allowed_origin_set
- heat::cors::allowed_origin: {get_param: HeatCorsAllowedOrigin}
- heat::notification_driver: {get_param: NotificationDriver}
@ -196,11 +195,10 @@ outputs:
heat::cron::purge_deleted::age_type: {get_param: HeatCronPurgeDeletedAgeType}
heat::cron::purge_deleted::destination: {get_param: HeatCronPurgeDeletedDestination}
heat::max_json_body_size: {get_param: HeatMaxJsonBodySize}
-
heat::cache::enabled: {get_param: EnableCache}
- heat::cache::enabled: {get_param: EnableCache}
heat::cache::tls_enabled: {get_param: MemcachedTLS}
heat::cache::resource_finder_caching: false
if:
- if:
- tls_cache_enabled
- heat::cache::backend: 'dogpile.cache.pymemcache'
- heat::cache::backend: 'dogpile.cache.memcached'

2
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -193,7 +193,7 @@ outputs:
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
heat::engine::auth_encryption_key: {get_param: HeatAuthEncryptionKey}
heat::engine::plugin_dirs: {get_param: HeatEnginePluginDirs}
if:
- if:
- heat_workers_set
- heat::engine::num_engine_workers: {get_param: HeatWorkers}
service_config_settings: