diff options
| -rw-r--r-- | build/baremetal-environment.yaml | 9 | ||||
| -rwxr-xr-x | build/undercloud.sh | 1 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 4 |
3 files changed, 13 insertions, 1 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 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}" |