From c67baa84baf6e5d5d1b07c0b9468e2435d50a970 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 26 Apr 2017 09:47:48 -0400 Subject: Sets baremetal workers to 12 There is an issue where in Newton the number of workers (sub processes) opened per openstack service scales with the number of logical cores on the system. On servers with large amount of processors this causes the cloud to fail after some time due to running out of RAM. This patch will limit the number of worker processes to 12, which is the limit in Ocata and onwards. JIRA: APEX-410 Change-Id: I28c4762830c19cd758a0729017f2d4a9ebe372b4 Signed-off-by: Tim Rozet --- build/baremetal-environment.yaml | 9 +++++++++ build/undercloud.sh | 1 + lib/overcloud-deploy-functions.sh | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 build/baremetal-environment.yaml diff --git a/build/baremetal-environment.yaml b/build/baremetal-environment.yaml new file mode 100644 index 00000000..677b313a --- /dev/null +++ b/build/baremetal-environment.yaml @@ -0,0 +1,9 @@ +parameter_defaults: + HeatWorkers: 12 + CeilometerWorkers: 12 + CinderWorkers: 12 + GlanceWorkers: 12 + KeystoneWorkers: 12 + NeutronWorkers: 12 + NovaWorkers: 12 + SwiftWorkers: 12 diff --git a/build/undercloud.sh b/build/undercloud.sh index de96f029..f6ab4bc0 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -56,6 +56,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/ovs-dpdk-preconfig.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/csit-environment.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \ + --upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \ --install "python2-congressclient" \ --run-command "sed -i '/SwiftPassword/a\ \x27TackerPassword\x27,' /usr/lib/python2.7/site-packages/tripleo_common/constants.py" \ --run-command "sed -i '/CinderPassword/a\ \x27CongressPassword\x27,' /usr/lib/python2.7/site-packages/tripleo_common/constants.py" \ diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index f2c9a857..271b4b84 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -360,7 +360,9 @@ EOI DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" if [[ "$virtual" == "TRUE" ]]; then - DEPLOY_OPTIONS+=" -e virtual-environment.yaml" + DEPLOY_OPTIONS+=" -e virtual-environment.yaml" + else + DEPLOY_OPTIONS+=" -e baremetal-environment.yaml" fi echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}" -- cgit 1.2.3-korg