From acbaf5dcbea959377f37b057add3203906a58717 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 18 Jul 2016 17:34:59 -0400 Subject: Makes flavor consistent in virtual/baremetal deploys Changes include: - Fixes bug where baremetal control nodes would deploy to ironic nodes labeled 'compute', and cause deployment failure - Makes virtual deployments also use flavor types when deploying JIRA: APEX-205 Change-Id: I84e1a6d1e2ccc3391ad2b4e34ea6ca62d480d64f Signed-off-by: Tim Rozet --- lib/overcloud-deploy-functions.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') 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 -- cgit 1.2.3-korg