diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-09 21:33:34 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-10 02:11:17 +0200 |
| commit | 395b043ac49f1148d12206669cb19402812d547a (patch) | |
| tree | d5f6bdb1a02082e54e7473373c388d3833155673 | |
| parent | 91312836e649c24d2d0268f1f5c8aa45fdd79a8d (diff) | |
scenario: Add AArch64 defaults
Move scenario defaults.yml out of virtual/baremetal dirs, unifying
them into a single, arch-specific defaults configuration file.
Add AArch64 equivalent config, and arch-qualify default filename.
For AArch64, bump VCPU number from 2 to 6.
Change-Id: If9b39850af96e4c46e868b1d532bd301f9fd9f26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rwxr-xr-x | ci/deploy.sh | 15 | ||||
| -rw-r--r-- | mcp/config/scenario/defaults-aarch64.yaml (renamed from mcp/config/scenario/virtual/defaults.yaml) | 4 | ||||
| -rw-r--r-- | mcp/config/scenario/defaults-x86_64.yaml (renamed from mcp/config/scenario/baremetal/defaults.yaml) | 0 |
3 files changed, 13 insertions, 6 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 4b64000e1..e592f8820 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -294,20 +294,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} diff --git a/mcp/config/scenario/virtual/defaults.yaml b/mcp/config/scenario/defaults-aarch64.yaml index b841e88c9..17fbbfcbe 100644 --- a/mcp/config/scenario/virtual/defaults.yaml +++ b/mcp/config/scenario/defaults-aarch64.yaml @@ -1,6 +1,6 @@ -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img virtual: default: - vcpus: 2 + vcpus: 6 ram: 4096 diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/defaults-x86_64.yaml index b841e88c9..b841e88c9 100644 --- a/mcp/config/scenario/baremetal/defaults.yaml +++ b/mcp/config/scenario/defaults-x86_64.yaml |