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 <trozet@redhat.com>

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 7a3ae73..fe37aba 100644 (file)
--- 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 992d22a..3652240 100755 (executable)
--- 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