From c38832004b18c120c796dcfff6e333d60392bc9c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 7 Apr 2018 10:58:08 +0200 Subject: [fuel] IA: Add PXE/admin static IPs - check-jinja2.sh: Add template dir to include dirs; - add param definitions for PXE/admin static IP for each machine, moving MaaS DHCP range start after the new addresses, similar to public network; - drop 'opnfv_' prefix for compute parameters; - drop 'opnfv_jump_bridge_*' variables (deprecated); - drop 'opnfv_infra_maas_*' variables, handled directly in Fuel now; - add 'opnfv_net_*_mask' for all used networks in idf.net_config; - move all internal j2 variables to net_map.j2, so we can reuse them without pod_config; - refactor maas variables into a full `maas.region.machines` section when baremetal nodes are defined; - drop 'openstack_compute_*' reclass params in favor of direct expansion in reclass.storage definitions via j2 in Fuel@OPNFV; - add `net_macros.j2` for reclass linux.network reclass generation; - move all non-sensitive reclass parameters to Fuel@OPNFV; Change-Id: I495c6072d845b273b6607d45dc5152ec4ee767cf Signed-off-by: Alexandru Avadanii --- config/utils/check-jinja2.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/utils/check-jinja2.sh') diff --git a/config/utils/check-jinja2.sh b/config/utils/check-jinja2.sh index 16e52130..d42a2cde 100755 --- a/config/utils/check-jinja2.sh +++ b/config/utils/check-jinja2.sh @@ -51,7 +51,8 @@ while IFS= read -r lab_config; do continue fi while IFS= read -r jinja_template; do - pdf_gen_cmd="${GEN_CFG} -y ${lab_config} -j ${jinja_template}" + pdf_gen_cmd="${GEN_CFG} -y ${lab_config} -j ${jinja_template}" \ + "-i $(dirname "${jinja_template}")" if ${pdf_gen_cmd} > "${TMPF}"; then ((pdf_inst_pass+=1)) echo "[GENERATE] [OK] ${pdf_gen_cmd}" -- cgit 1.2.3-korg