diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 28 | ||||
| m--------- | mcp/scripts/pharos | 0 | ||||
| -rw-r--r-- | mcp/scripts/virsh_net/net_public.xml.j2 | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index c9159fff6..e522fd610 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -# shellcheck disable=SC2155,SC1001,SC2015 +# shellcheck disable=SC2155,SC1001,SC2015,SC2128 ############################################################################## # Copyright (c) 2017 Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials @@ -318,6 +318,7 @@ function prepare_vms { } function jumpserver_check_requirements { + # shellcheck disable=SC2178 local vnodes=$1; shift local br=("$@") local err_br_not_found='Linux bridge not found!' @@ -538,8 +539,7 @@ function do_templates() { RECLASS_CLUSTER_DIR=$(cd "${git_repo_root}/mcp/reclass/classes/cluster"; pwd) PHAROS_GEN_CFG="./pharos/config/utils/generate_config.py" - PHAROS_INSTALLER_ADAPTER="./pharos/config/installers/fuel/pod_config.yml.j2" - PHAROS_INSTALLER_NETMAP="$(dirname "${PHAROS_INSTALLER_ADAPTER}")/net_map.j2" + PHAROS_IA=$(readlink -f "./pharos/config/installers/fuel/pod_config.yml.j2") PHAROS_VALIDATE_SCHEMA_SCRIPT="./pharos/config/utils/validate_schema.py" PHAROS_SCHEMA_PDF="./pharos/config/pdf/pod1.schema.yaml" PHAROS_SCHEMA_IDF="./pharos/config/pdf/idf-pod1.schema.yaml" @@ -563,14 +563,14 @@ function do_templates() { if [[ ! "$target_pod" =~ "virtual" ]]; then if ! "${PHAROS_VALIDATE_SCHEMA_SCRIPT}" -y "${LOCAL_PDF}" \ -s "${PHAROS_SCHEMA_PDF}"; then - notify_e "[ERROR] PDF does not match yaml schema!\n" 1>&2 + notify_e "[ERROR] PDF does not match yaml schema!" elif ! "${PHAROS_VALIDATE_SCHEMA_SCRIPT}" -y "${LOCAL_IDF}" \ -s "${PHAROS_SCHEMA_IDF}"; then - notify_e "[ERROR] IDF does not match yaml schema!\n" 1>&2 + notify_e "[ERROR] IDF does not match yaml schema!" fi fi if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" \ - -j "${PHAROS_INSTALLER_ADAPTER}" > "${image_dir}/pod_config.yml"; then + -j "${PHAROS_IA}" -v > "${image_dir}/pod_config.yml"; then notify_e "[ERROR] Could not convert PDF+IDF to reclass model input!" fi template_dirs="${scenario_dir}" @@ -579,16 +579,14 @@ function do_templates() { # Expand reclass and virsh network templates based on PDF + IDF printenv | \ awk '/^(SALT|MCP|MAAS|CLUSTER).*=/ { gsub(/=/,": "); print }' >> "${LOCAL_PDF}" - template_dirs="${RECLASS_CLUSTER_DIR} virsh_net ./*j2" + template_dirs="${RECLASS_CLUSTER_DIR} $(readlink -f virsh_net) $(readlink -f ./*j2)" template_err_str='Could not convert PDF to network definitions!' fi # shellcheck disable=SC2086 - find ${template_dirs} -name '*.j2' | while read -r tp; do - # Jinja2 import does not allow '..' directory traversal - ln -sf "$(readlink -f "${PHAROS_INSTALLER_NETMAP}")" "$(dirname "${tp}")" - if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" -j "${tp}" > "${tp%.j2}"; then - notify_e "[ERROR] ${template_err_str}" - fi - rm -f "$(dirname "${tp}")/$(basename "${PHAROS_INSTALLER_NETMAP}")" - done + j2args=$(find $template_dirs -name '*.j2' -exec echo -j {} \;) + # shellcheck disable=SC2086 + if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" ${j2args} -b -v \ + -i "$(dirname "${PHAROS_IA}")"; then + notify_e "[ERROR] ${template_err_str}" + fi } diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject fb55d5ab735d6941ecfea9b0bcfe3a23eb8117a +Subproject 31435de5085f1a5bb9cf965cdbce005fc04781d diff --git a/mcp/scripts/virsh_net/net_public.xml.j2 b/mcp/scripts/virsh_net/net_public.xml.j2 index bc9d64dc1..737b638b3 100644 --- a/mcp/scripts/virsh_net/net_public.xml.j2 +++ b/mcp/scripts/virsh_net/net_public.xml.j2 @@ -9,7 +9,7 @@ {%- set cluster = {'has_virtual_nodes': False} %} {%- for node in conf.nodes %} {%- if not cluster.has_virtual_nodes and node.node.type == 'virtual' %} - {%- set _ = cluster.update({'has_virtual_nodes': True}) %} + {%- do cluster.update({'has_virtual_nodes': True}) %} {%- endif %} {%- endfor %} {%- if conf.idf.net_config.public is defined %} |