diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-09-11 08:11:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 08:11:32 +0000 |
| commit | afff6db2867d9d0ee19fb4a399799b80d91af993 (patch) | |
| tree | 00a953db2b67b041457b873278a03f54f73e226b /ci | |
| parent | 66bc7b3993bcea31d47cf32907b6b0a410e090f4 (diff) | |
| parent | 395b043ac49f1148d12206669cb19402812d547a (diff) | |
Merge "scenario: Add AArch64 defaults"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 849ed6c26..36056c8b0 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -295,20 +295,27 @@ if [ "$(uname -i)" = "aarch64" ]; then fi # Check scenario file existence -if [ ! -f "../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml" ]; then +SCENARIO_DIR="../config/scenario" +if [ ! -f "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml" ]; then notify "[WARN] ${DEPLOY_SCENARIO}.yaml not found! \ Setting simplest scenario (os-nosdn-nofeature-noha)\n" 3 DEPLOY_SCENARIO='os-nosdn-nofeature-noha' - if [ ! -f "../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml" ]; then + if [ ! -f "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml" ]; then notify "[ERROR] Scenario definition file is missing!\n" 1>&2 exit 1 fi fi +# Check defaults file existence +if [ ! -f "${SCENARIO_DIR}/defaults-$(uname -i).yaml" ]; then + notify "[ERROR] Scenario defaults file is missing!\n" 1>&2 + exit 1 +fi + # Get required infra deployment data source lib.sh -eval "$(parse_yaml "../config/scenario/${DEPLOY_TYPE}/defaults.yaml")" -eval "$(parse_yaml "../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")" +eval "$(parse_yaml "${SCENARIO_DIR}/defaults-$(uname -i).yaml")" +eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")" export CLUSTER_DOMAIN=${cluster_domain} |