diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-05-23 10:45:13 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-05-23 10:52:09 -0400 |
| commit | be03cde24377105b340bbd2d5acae84617ffb7c6 (patch) | |
| tree | 42e7846127366f250ce1498329fd0e9f3382eaee /ci | |
| parent | 7879a52a6d429fb33abf3b76ee8bb5a826a96286 (diff) | |
Limits engine workers for virtual deployments
Heat uses sub-process forking for increasing number of workers to handle
tasks. This patch limits number of workers in undercloud and overcloud
for virtual deployments to help battle resource contention.
Change-Id: I70edff708b7dcaf114b285046af3138a67167150
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 5cde7992..9cdd8297 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -739,6 +739,11 @@ sleep 30 sudo systemctl restart openstack-glance-api sudo systemctl restart openstack-nova-conductor sudo systemctl restart openstack-nova-compute + +sudo sed -i '/num_engine_workers/c\num_engine_workers = 2' /etc/heat/heat.conf +sudo sed -i '/#workers\s=/c\workers = 2' /etc/heat/heat.conf +sudo systemctl restart openstack-heat-engine +sudo systemctl restart openstack-heat-api EOI # WORKAROUND: must restart the above services to fix sync problem with nova compute manager # TODO: revisit and file a bug if necessary. This should eventually be removed @@ -834,6 +839,8 @@ function undercloud_prep_overcloud_deploy { if [[ ! "$virtual" == "TRUE" ]]; then DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" + else + DEPLOY_OPTIONS+=" -e virtual-environment.yaml" fi DEPLOY_OPTIONS+=" -e opnfv-environment.yaml" |