summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Morgan <jack.morgan@intel.com>2017-12-14 01:10:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-14 01:10:36 +0000
commit3035a3115a6d6b49223d4f326f5c3a705f115579 (patch)
tree8add737fb64453c8a639c9fe6fc747860a0a60d8
parentd67405495e8e8da1ccd02b1f9034e3807adbe9fe (diff)
parent65482c5f30dc3a48584155c919fca71a5d943a5a (diff)
Merge "PDF: generate_config: Add IDF parsing support" into stable/euphrates
-rwxr-xr-xconfig/utils/generate_config.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py
index a32367af..18af98db 100755
--- a/config/utils/generate_config.py
+++ b/config/utils/generate_config.py
@@ -2,6 +2,7 @@
"""This module does blah blah."""
import argparse
import ipaddress
+import os
import yaml
from jinja2 import Environment, FileSystemLoader
@@ -44,6 +45,13 @@ ENV.filters['dpkg_arch'] = dpkg_arch
with open(ARGS.yaml) as _:
DICT = yaml.safe_load(_)
+# If an installer descriptor file (IDF) exists, include it (temporary)
+IDF_PATH = '/idf-'.join(os.path.split(ARGS.yaml))
+if os.path.exists(IDF_PATH):
+ with open(IDF_PATH) as _:
+ IDF = yaml.safe_load(_)
+ DICT['idf'] = IDF['idf']
+
# Print dictionary generated from yaml (uncomment for debug)
# print(DICT)