diff options
author | 2017-10-26 20:54:41 +0200 | |
---|---|---|
committer | 2017-10-27 10:06:43 +0000 | |
commit | 5d8939c62456209b878c61e12f3cb354b2e7c755 (patch) | |
tree | f53517810b90d740079d8f140741f95f35ceb7de /ci | |
parent | b6e65dbb9952aeafeff6fcc07b6dcd97940d62ff (diff) |
lib.sh: Fix compatibility with bash 4.2
JIRA: FUEL-296
Change-Id: Ide9f9333fe9b44ff6b78678064f8e67f05aabd42
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit fa62907da62d0b8ae9e733a9729941065ceedf4d)
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/deploy.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 9a28b5ade..834ced39f 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -329,13 +329,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 \ @@ -392,12 +394,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 |