summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-07-20 01:15:07 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-20 01:15:07 +0000
commite255c4e1bfc2ab88a8bf0636cd7ca43d30ffb52c (patch)
treef0aef5eda9db3eef3ea76309fe5d6117533d27ff /lib
parent9dbe4eb096c7f20d4375bd298968f42a10914b0e (diff)
parentacbaf5dcbea959377f37b057add3203906a58717 (diff)
Merge "Makes flavor consistent in virtual/baremetal deploys"
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh5
1 files changed, 2 insertions, 3 deletions
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