diff options
| -rw-r--r-- | build/opnfv-environment.yaml | 3 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 7a3ae739..fe37aba8 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -3,7 +3,8 @@ parameters: controllerImage: overcloud-full - OvercloudControlFlavor: baremetal + OvercloudControlFlavor: control + OvercloudComputeFlavor: compute ControllerEnableSwiftStorage: false EnableSahara: false ExtraConfig: diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 992d22af..36522402 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -183,9 +183,8 @@ EOI DEPLOY_OPTIONS+=" --ntp-server $ntp_server" fi - if [[ ! "$virtual" == "TRUE" ]]; then - DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" - else + DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" + if [[ "$virtual" == "TRUE" ]]; then DEPLOY_OPTIONS+=" -e virtual-environment.yaml" fi |