summaryrefslogtreecommitdiffstats
path: root/ci/genBundle.py
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-08-06 00:03:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-06 00:03:42 +0000
commit0f81e81552bdf0053fc0303c53dff455c17d56a6 (patch)
tree53b0f53d58692fd54a55b9674c4719d61515e987 /ci/genBundle.py
parenta56fce4f323d8a6a232f0205e03c6f601b7eefb5 (diff)
parent5cc5559348a8a18a41cfd25cce446955d63afb83 (diff)
Merge "New scripts for configs generation, based on jinja2"
Diffstat (limited to 'ci/genBundle.py')
-rw-r--r--ci/genBundle.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/ci/genBundle.py b/ci/genBundle.py
index 8648ac3a..9c6781b5 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -34,7 +34,7 @@ labconfig_file = options.lab
scenarioconfig_file = 'default_deployment_config.yaml'
# Capture our current directory
-TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/bundle_tpl'
+TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/bundle_tpl'
#
# Prepare variables
@@ -186,8 +186,6 @@ if 'trusty' in extra:
if 'liberty' in extra:
config['os']['release'] = 'liberty'
-# pp(config)
-
#
# Transform template to bundle.yaml according to config
#
@@ -204,4 +202,13 @@ env.globals.update(unit_ceph_qty=unit_ceph_qty)
env.globals.update(to_select=to_select)
# Render the template
-print(template.render(**config))
+output = template.render(**config)
+
+# Check output syntax
+try:
+ yaml.load(output)
+except yaml.YAMLError as exc:
+ print(exc)
+
+# print output
+print(output)