aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-10 13:11:52 +0000
committerGerrit Code Review <review@openstack.org>2017-07-10 13:11:52 +0000
commit83defdbdbf12a4ba9d843cd115d1acb931d1d151 (patch)
tree0e08cfee5cad871b1c0a38921e6dcc3060d2efe1 /tools
parent766de0cacb18171264d2a699ac48cacb8d35a152 (diff)
parent566a40b148bbbb9bd9310b41a776deb39ab5e48a (diff)
Merge "Modify generic role template to support custom networks"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/process-templates.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/process-templates.py b/tools/process-templates.py
index c7d5ed9e..badc1426 100755
--- a/tools/process-templates.py
+++ b/tools/process-templates.py
@@ -146,13 +146,15 @@ def process_templates(template_path, role_data_path, output_dir,
out_f_path = os.path.join(out_dir, out_f)
if not (out_f_path in excl_templates):
if '{{role.name}}' in template_data:
- j2_data = {'role': r_map[role]}
+ j2_data = {'role': r_map[role],
+ 'networks': network_data}
_j2_render_to_file(template_data, j2_data,
out_f_path, overwrite)
else:
# Backwards compatibility with templates
# that specify {{role}} vs {{role.name}}
- j2_data = {'role': role}
+ j2_data = {'role': role,
+ 'networks': network_data}
# (dprince) For the undercloud installer we
# don'twant to have heat check nova/glance
# API's