openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix some template conditions"

This commit is contained in:
Zuul 2021-04-09 01:39:43 +00:00 committed by Gerrit Code Review
parent 4e7e35b4e8 95bc75aaf2
commit 04620d261e
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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: