From 2490b7463f3a2fc86277f957945b92263495c01c Mon Sep 17 00:00:00 2001 From: grakiss Date: Thu, 17 Mar 2016 02:39:36 -0400 Subject: Clarify the config file to dha file JIRA:COMPASS-344 - make it easy Change-Id: I6e29136670f7a9f75ff90e893eff865d77235b31 Signed-off-by: grakiss --- deploy/config_parse.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'deploy/config_parse.py') diff --git a/deploy/config_parse.py b/deploy/config_parse.py index 21fe76d3..ba677ade 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, config_file, conf_dir, ofile): +def export_dha_file(s, dha_file, conf_dir, ofile): env = {} env.update(s) if env.get('hosts', []): @@ -44,7 +44,7 @@ def export_config_file(s, config_file, 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}) + env.update({'DHA': dha_file}) value = hostmacs(s, ',') if len(value) > 0: @@ -72,15 +72,15 @@ if __name__ == "__main__": print("parameter wrong%d %s" % (len(sys.argv), sys.argv)) sys.exit(1) - _, config_file, conf_dir, tmpl_dir, output_dir, output_file = sys.argv + _, dha_file, conf_dir, tmpl_dir, output_dir, output_file = sys.argv - if not os.path.exists(config_file): - print("%s is not exist" % config_file) + if not os.path.exists(dha_file): + print("%s is not exist" % dha_file) sys.exit(1) - data = init(config_file) + data = init(dha_file) - export_config_file(data, config_file, conf_dir, os.path.join(output_dir, output_file)) + export_dha_file(data, dha_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