Merge "Makes flavor consistent in virtual/baremetal deploys"

diff --combined build/opnfv-environment.yaml
index 5f9c734,fe37aba..0f84152
--- 1/build/opnfv-environment.yaml
--- 2/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@@ -3,9 -3,9 +3,10 @@@
  
  parameters:
    controllerImage: overcloud-full
-   OvercloudControlFlavor: baremetal
+   OvercloudControlFlavor: control
+   OvercloudComputeFlavor: compute
    ControllerEnableSwiftStorage: false
 +#  CloudDomain:
    EnableSahara: false
    ExtraConfig:
      tripleo::ringbuilder::build_ring: False

diff --combined lib/overcloud-deploy-functions.sh
index 41aaf26,3652240..a08739a
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -183,9 -183,8 +183,8 @@@ EO
       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
  
@@@ -230,7 -229,6 +229,7 @@@ for dns_server in ${dns_servers}; d
    dns_server_ext="\${dns_server_ext} --dns-nameserver \${dns_server}"
  done
  neutron subnet-update \$(neutron subnet-list | grep -Ev "id|tenant|external|storage" | grep -v \\\\-\\\\- | awk {'print \$2'}) \${dns_server_ext}
 +sed -i '/CloudDomain:/c\  CloudDomain: '${domain_name} opnfv-environment.yaml
  echo "Executing overcloud deployment, this should run for an extended period without output."
  sleep 60 #wait for Hypervisor stats to check-in to nova
  # save deploy command so it can be used for debugging