Code Review / apex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 9dbe4eb acbaf5d)
Merge "Makes flavor consistent in virtual/baremetal deploys"
authorDan Radez <dradez@redhat.com>
Wed, 20 Jul 2016 01:15:07 +0000 (01:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 20 Jul 2016 01:15:07 +0000 (01:15 +0000)
1  2 
build/opnfv-environment.yaml patch | diff1 | diff2 | blob | history
lib/overcloud-deploy-functions.sh patch | diff1 | diff2 | blob | history

diff --cc 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 --cc lib/overcloud-deploy-functions.sh
Simple merge