aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-27 20:26:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-27 20:26:24 +0000
commita9e172b43c5ab17b1c1971dbb6fccf2e66bbe520 (patch)
treed0439c02b8bc801a11c48ddd06d2944e3b4036b2 /ci
parent389271f828486c77aec3cdd5a3405bb6d090d4b0 (diff)
parent5d8939c62456209b878c61e12f3cb354b2e7c755 (diff)
Merge "lib.sh: Fix compatibility with bash 4.2" into stable/euphrates
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 787f7dee5..6a1d6e1e6 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -331,13 +331,15 @@ eval "$(parse_yaml "${LOCAL_PDF_RECLASS}")"
export CLUSTER_DOMAIN=${cluster_domain}
-declare -A virtual_nodes_ram virtual_nodes_vcpus
+# Serialize vnode data as '<name0>,<ram0>,<vcpu0>|<name1>,<ram1>,<vcpu1>[...]'
for node in "${virtual_nodes[@]}"; do
virtual_custom_ram="virtual_${node}_ram"
virtual_custom_vcpus="virtual_${node}_vcpus"
- virtual_nodes_ram[$node]=${!virtual_custom_ram:-$virtual_default_ram}
- virtual_nodes_vcpus[$node]=${!virtual_custom_vcpus:-$virtual_default_vcpus}
+ virtual_nodes_data+="${node},"
+ virtual_nodes_data+="${!virtual_custom_ram:-$virtual_default_ram},"
+ virtual_nodes_data+="${!virtual_custom_vcpus:-$virtual_default_vcpus}|"
done
+virtual_nodes_data=${virtual_nodes_data%|}
# Expand reclass and virsh network templates
for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-ocata-common/opnfv/"*.template \
@@ -394,12 +396,11 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then
check_connection
else
generate_ssh_key
- prepare_vms virtual_nodes "${base_image}" "${STORAGE_DIR}"
- create_networks OPNFV_BRIDGES
- create_vms virtual_nodes virtual_nodes_ram virtual_nodes_vcpus \
- OPNFV_BRIDGES "${STORAGE_DIR}"
+ prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_nodes[@]}"
+ create_networks "${OPNFV_BRIDGES[@]}"
+ create_vms "${STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}"
update_mcpcontrol_network
- start_vms virtual_nodes
+ start_vms "${virtual_nodes[@]}"
check_connection
fi
if [ ${USE_EXISTING_INFRA} -lt 2 ]; then