diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-02-15 09:06:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-15 09:06:26 +0000 |
| commit | 3e403c85966b8f21996089318a1f8689d6a1248f (patch) | |
| tree | f840e7ded760b0bfd457eca29181e41c99781c3a /deploy/config_parse.py | |
| parent | 85308a67a409694de2eca3f89ef3fbcc390416a9 (diff) | |
| parent | 33e9c3c7780a663ead5e0133b11de15332b62835 (diff) | |
Merge "update default dha file and iso path"
Diffstat (limited to 'deploy/config_parse.py')
| -rw-r--r-- | deploy/config_parse.py | 5 |
1 files changed, 3 insertions, 2 deletions
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) |