From: Dan Radez <dradez@redhat.com>
Date: Wed, 20 Jul 2016 01:15:07 +0000 (+0000)
Subject: Merge "Makes flavor consistent in virtual/baremetal deploys"
X-Git-Tag: colorado.1.0~116
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e255c4e1bfc2ab88a8bf0636cd7ca43d30ffb52c;p=apex.git

Merge "Makes flavor consistent in virtual/baremetal deploys"
---

e255c4e1bfc2ab88a8bf0636cd7ca43d30ffb52c
diff --cc build/opnfv-environment.yaml
index 5f9c7340,fe37aba8..0f841529
--- a/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