diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-20 01:15:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-20 01:15:07 +0000 |
| commit | e255c4e1bfc2ab88a8bf0636cd7ca43d30ffb52c (patch) | |
| tree | f0aef5eda9db3eef3ea76309fe5d6117533d27ff | |
| parent | 9dbe4eb096c7f20d4375bd298968f42a10914b0e (diff) | |
| parent | acbaf5dcbea959377f37b057add3203906a58717 (diff) | |
Merge "Makes flavor consistent in virtual/baremetal deploys"
| -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 5f9c7340..0f841529 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 # CloudDomain: EnableSahara: false diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 41aaf26d..a08739ab 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 |