summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-04-26 09:47:48 -0400
committerTim Rozet <trozet@redhat.com>2017-04-26 09:53:55 -0400
commitc67baa84baf6e5d5d1b07c0b9468e2435d50a970 (patch)
treed12a9042ac1af5b7f242d44514a5b88f7cf383f2
parent762ccea54e63eb710491a6da56f5eb3aaa8b8120 (diff)
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 <trozet@redhat.com>
-rw-r--r--build/baremetal-environment.yaml9
-rwxr-xr-xbuild/undercloud.sh1
-rwxr-xr-xlib/overcloud-deploy-functions.sh4
3 files changed, 13 insertions, 1 deletions
diff --git a/build/baremetal-environment.yaml b/build/baremetal-environment.yaml
new file mode 100644
index 0000000..677b313
--- /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 de96f02..f6ab4bc 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 f2c9a85..271b4b8 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}"