aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Morgan <jack.morgan@intel.com>2017-09-19 23:33:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-19 23:33:55 +0000
commit12f65d24e1897097d67a49c300b9a57909a1be18 (patch)
treecf83f6b5322082dc1645cc4268c93e7ae75151f2
parentcf5cb795cf80a5ee99a318d764905474076305a4 (diff)
parent723d9f06c79040b72769518018ef2a9a39092274 (diff)
Merge "Use pharos submodule for PDF validation"
-rw-r--r--.gitmodules3
-rwxr-xr-xcheck-jinja2.sh10
m---------pharos0
3 files changed, 9 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..fa83351
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "pharos"]
+ path = pharos
+ url = https://github.com/opnfv/pharos
diff --git a/check-jinja2.sh b/check-jinja2.sh
index 4c1927d..0a79364 100755
--- a/check-jinja2.sh
+++ b/check-jinja2.sh
@@ -1,9 +1,11 @@
#!/bin/bash
set +x
set -o errexit
+git submodule update --init --remote 2>/dev/null
+GEN_CFG="./pharos/config/utils/generate_config.py"
for lab_configs in $(find labs/ -name 'pod*.yaml'); do
- while IFS= read -r jinja_templates; do
- echo "./utils/generate_config.py -y $lab_configs -j $jinja_templates"
- ./utils/generate_config.py -y $lab_configs -j $jinja_templates
- done < <(find installers/ -name '*.j2')
+ while IFS= read -r jinja_templates; do
+ echo "$GEN_CFG -y $lab_configs -j $jinja_templates"
+ $GEN_CFG -y $lab_configs -j $jinja_templates
+ done < <(find pharos/config/installers/ -name '*.j2')
done
diff --git a/pharos b/pharos
new file mode 160000
+Subproject 3d98d06d697d38fd6bcbf66b29eecd1b61d0ae0