diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-07-18 17:34:59 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-07-18 17:34:59 -0400 |
| commit | acbaf5dcbea959377f37b057add3203906a58717 (patch) | |
| tree | c939c7422729115250a506c9b5b6a9a1d9e5a5fe | |
| parent | 9f7c8cc97bb73069455b5357c0d4c0dcfc26d5a3 (diff) | |
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>
| -rw-r--r-- | build/opnfv-environment.yaml | 3 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 7a3ae739..fe37aba8 100644 --- 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 992d22af..36522402 100755 --- 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 |