Merge "Makes flavor consistent in virtual/baremetal deploys"

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 5f9c734..0f84152 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
 #  CloudDomain:
   EnableSahara: false

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 41aaf26..a08739a 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