openstack
/
instack-undercloud
Code Issues Proposed changes

Increase the default number of workers for heat engine 

We switched to a saner default for service workers on the undercloud
with this patch[1]. However, reducing the number of workers for heat
engine is not so sane. The massive nested stack we are deploying grinds
to a halt with only two engine workers, which is now our saner default
for any system with 8 or fewer CPU cores.

This patch changes to using the heat default for the number of engine
workers which is max(#CPUs,4).

[1] https://git.openstack.org/cgit/openstack/instack-undercloud/commit/?id=ee5f25a726910961caf72de2c6c55de06c922b74

Change-Id: I95df0f39f37316cc56eafb351c823197f252d7b7
Related-Bug: 1638908
This commit is contained in:
John Trowbridge 2016-11-18 09:22:57 -05:00 committed by Alex Schultz
parent 0114b11ddf
commit 34ec264428
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -150,7 +150,10 @@ heat::engine::trusts_delegated_roles: []
heat::engine::auth_encryption_key: {{UNDERCLOUD_HEAT_ENCRYPTION_KEY}}
heat::engine::max_resources_per_stack: -1
heat::engine::convergence_engine: false
heat::engine::num_engine_workers: "%{::os_workers}"
# NOTE(trown): We need to give heat engine more workers because we are throwing huge
# nested stacks at it for the deploy. By not setting this, we get the heat default,
# which is max(#CPUs,4).
#heat::engine::num_engine_workers:
heat::engine::max_nested_stack_depth: 6
heat::instance_user: heat-admin
heat::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}