From b356fbbd72be5814f870bfc1e42a97c68a0fdeab Mon Sep 17 00:00:00 2001 From: baigk Date: Mon, 15 Feb 2016 22:38:47 +0800 Subject: update default dha file and iso path JIRA: COMPASS-313 Change-Id: I3e3c8016917513a2a8a963f2f007cb6faa4a1c7e Signed-off-by: baigk (cherry picked from commit 33e9c3c7780a663ead5e0133b11de15332b62835) --- deploy/config_parse.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'deploy/config_parse.py') diff --git a/deploy/config_parse.py b/deploy/config_parse.py index 172388ce..63269f3b 100644 --- a/deploy/config_parse.py +++ b/deploy/config_parse.py @@ -34,7 +34,7 @@ def hostroles(s, seq, host=None): def hostmacs(s, seq, host=None): return host.get('mac', '') -def export_config_file(s, conf_dir, ofile): +def export_config_file(s, config_file, conf_dir, ofile): env = {} env.update(s) if env.get('hosts', []): @@ -47,6 +47,7 @@ def export_config_file(s, conf_dir, ofile): env.update({'FLAVOR': s.get('FLAVOR', "cluster")}) env.update({'HOSTNAMES': hostnames(s, ',')}) env.update({'HOST_ROLES': hostroles(s, ';')}) + env.update({'DHA': config_file}) value = hostmacs(s, ',') if len(value) > 0: @@ -82,7 +83,7 @@ if __name__ == "__main__": data = init(config_file) - export_config_file(data, conf_dir, os.path.join(output_dir, output_file)) + export_config_file(data, config_file, conf_dir, os.path.join(output_dir, output_file)) export_reset_file(data, tmpl_dir, output_dir, os.path.join(output_dir, output_file)) sys.exit(0) -- cgit 1.2.3-korg