openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use conditional to set heat-engine workers"

Browse Source
This commit is contained in:
Jenkins 2017-09-26 19:27:02 +00:00 committed by Gerrit Code Review
commit ca05268dcf
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/services/heat-engine.yaml
View File

@ -69,6 +69,8 @@ parameters:
default: 1000 default: 1000
description: Maximum resources allowed per top-level stack. -1 stands for unlimited. description: Maximum resources allowed per top-level stack. -1 stands for unlimited.
conditions:
heat_workers_unset: {equals : [{get_param: HeatWorkers}, 0]}
resources: resources:
HeatBase: HeatBase:
@ -93,8 +95,7 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [HeatBase, role_data, config_settings] - get_attr: [HeatBase, role_data, config_settings]
- heat::engine::num_engine_workers: {get_param: HeatWorkers} - heat::engine::configure_delegated_roles: false
heat::engine::configure_delegated_roles: false
heat::engine::trusts_delegated_roles: [] heat::engine::trusts_delegated_roles: []
heat::engine::max_nested_stack_depth: 6 heat::engine::max_nested_stack_depth: 6
heat::engine::max_resources_per_stack: {get_param: HeatMaxResourcesPerStack} heat::engine::max_resources_per_stack: {get_param: HeatMaxResourcesPerStack}
@ -134,6 +135,11 @@ outputs:
passwords: passwords:
- {get_param: HeatAuthEncryptionKey} - {get_param: HeatAuthEncryptionKey}
- {get_param: [DefaultPasswords, heat_auth_encryption_key]} - {get_param: [DefaultPasswords, heat_auth_encryption_key]}
-
if:
- heat_workers_unset
- {}
- heat::engine::num_engine_workers: {get_param: HeatWorkers}
step_config: | step_config: |
include ::tripleo::profile::base::heat::engine include ::tripleo::profile::base::heat::engine