From be03cde24377105b340bbd2d5acae84617ffb7c6 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 23 May 2016 10:45:13 -0400 Subject: 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 --- build/undercloud.sh | 1 + build/virtual-environment.yaml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 build/virtual-environment.yaml (limited to 'build') diff --git a/build/undercloud.sh b/build/undercloud.sh index 65462ec8..ed4f2b34 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -67,6 +67,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum update -y openwsman*" \ --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \ --upload ../opnfv-environment.yaml:/home/stack/ \ + --upload ../virtual-environment.yaml:/home/stack/ \ -a undercloud.qcow2 popd > /dev/null diff --git a/build/virtual-environment.yaml b/build/virtual-environment.yaml new file mode 100644 index 00000000..6f1d0517 --- /dev/null +++ b/build/virtual-environment.yaml @@ -0,0 +1,17 @@ +parameter_defaults: + controllerExtraConfig: + # In releases before Mitaka, HeatWorkers doesn't modify + # num_engine_workers, so handle via heat::config + heat::config::heat_config: + DEFAULT/num_engine_workers: + value: 1 + heat::api_cloudwatch::enabled: false + heat::api_cfn::enabled: false + HeatWorkers: 1 + CeilometerWorkers: 1 + CinderWorkers: 1 + GlanceWorkers: 1 + KeystoneWorkers: 1 + NeutronWorkers: 1 + NovaWorkers: 1 + SwiftWorkers: 1 -- cgit 1.2.3-korg