diff options
author | Tim Rozet <trozet@redhat.com> | 2017-08-09 20:11:10 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-08-09 20:11:10 +0000 |
commit | 9fccd16b2998007022eb360cf06262f803ea84a4 (patch) | |
tree | a978140005ddac237af8230b3cbfd47d239a3917 | |
parent | 5597f9921bd46f5f0a100e64ed927f7170fe7725 (diff) | |
parent | be679ad66ecc4c314e6f0df9f94c775e61df3129 (diff) |
Merge "Sets baremetal workers to 12"
-rw-r--r-- | build/baremetal-environment.yaml | 9 | ||||
-rwxr-xr-x | build/undercloud.sh | 1 | ||||
-rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 |
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 34ed6ec1..3244e7f3 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -49,6 +49,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 7b08d18a..1f25a365 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}" |