summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-08-09 13:18:39 -0400
committerFeng Pan <fpan@redhat.com>2017-08-09 13:19:53 -0400
commitbe679ad66ecc4c314e6f0df9f94c775e61df3129 (patch)
treed9d117987ea811dfd8ef7a4935f2eedc3cfa1838
parenta36df896ab212bc3fc1705d1ead949a5fabcd77e (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> Signed-off-by: Feng Pan <fpan@redhat.com>
-rw-r--r--build/baremetal-environment.yaml9
-rwxr-xr-xbuild/undercloud.sh1
-rwxr-xr-xlib/overcloud-deploy-functions.sh2
3 files changed, 12 insertions, 0 deletions
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 0e1a2e35..b1e23233 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -48,6 +48,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 "libguestfs-tools" \
-a undercloud_build.qcow2
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index bfa98e54..c1f258ba 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -356,6 +356,8 @@ EOI
sleep 5
done
vbmc list
+ else
+ DEPLOY_OPTIONS+=" -e baremetal-environment.yaml"
fi
echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}"