diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-27 23:59:50 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 06:03:35 +0100 |
| commit | cefce150621699e9d9d3ac5c884a28ee4766c24d (patch) | |
| tree | 4d8a2fab067a179323328083e0ec4f0c54f6be4f /mcp/scripts | |
| parent | 342b6bad34e8c949aa81adf711e6a357e56942d3 (diff) | |
[virtual] PDF-based network defs for cluster nodes
Decouple virtual cluster nodes (ctl, gtw etc.) from opnfv_fn_* vars
in favor of parsing PDF/IDF.
This is the first step towards unifying baremetal and virtual network
definition templates, as well as allowing virtual nodes to run on a
remote hypervisor (and eventually with a different arch).
opnfv_fn_* vars will still be used for infra VMs spawned on FN (cfg01
and optionally mas01).
Adopt new 'net_map.j2' from Pharos submodule for new templates (virt),
as well as old ones (baremetal).
JIRA: FUEL-322
Change-Id: I150c2416566bbe42ea11cd00f12a8a7bf96776c2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 6f3c4383c..cc65f9ed7 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -490,6 +490,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" BASE_CONFIG_PDF="${lab_config_uri}/labs/${target_lab}/${target_pod}.yaml" BASE_CONFIG_IDF="${lab_config_uri}/labs/${target_lab}/idf-${target_pod}.yaml" LOCAL_PDF="${image_dir}/$(basename "${BASE_CONFIG_PDF}")" @@ -522,8 +523,10 @@ function do_templates() { # 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 } |