From e1d547e99c2daf4fe19c82f7e8284bcf183e05db Mon Sep 17 00:00:00 2001 From: Megh Bhatt Date: Tue, 31 Jan 2017 18:37:44 -0800 Subject: [PATCH] Change section 'DEFAULT' to 'DEFAULTS' in contrail-database-nodemgr.conf python ConfigParser treats section 'DEFAULT' as special and whatever is in the 'DEFAULT' section is propagated to every other section. Due to this, the current code in nodemgr is working only as a result of parsing the 'DISCOVERY' section and it fails once the 'DISCOVERY' section is removed. Change-Id: I16da136de441cdcedbd2ecfaaf6c86e8451e2206 Partial-Bug: #1660535 --- .../database_nodemgr/contrail-database-nodemgr.conf | 2 +- src/nodemgr/main.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf b/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf index 8e1f0ed2aa4..5557ef08dee 100644 --- a/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf +++ b/src/nodemgr/database_nodemgr/contrail-database-nodemgr.conf @@ -1,4 +1,4 @@ -[DEFAULT] +[DEFAULTS] hostip=127.0.0.1 #contrail_databases=config analytics minimum_diskGB=4 diff --git a/src/nodemgr/main.py b/src/nodemgr/main.py index 8ac356070c9..11c024aa6d0 100755 --- a/src/nodemgr/main.py +++ b/src/nodemgr/main.py @@ -103,8 +103,8 @@ def main(args_str=' '.join(sys.argv[1:])): return config = ConfigParser.SafeConfigParser() config.read([config_file]) - if 'DEFAULT' in config.sections(): - default.update(dict(config.items('DEFAULT'))) + if 'DEFAULTS' in config.sections(): + default.update(dict(config.items('DEFAULTS'))) if 'DISCOVERY' in config.sections(): disc_options.update(dict(config.items('DISCOVERY'))) disc_options['discovery_server'] = disc_options.pop('server') @@ -146,8 +146,9 @@ def main(args_str=' '.join(sys.argv[1:])): parser.add_argument("--introspect_ssl_enable", action="store_true", help="Enable ssl for introspect connection") if (node_type == 'contrail-database'): - parser.add_argument("--minimum_diskgb", + parser.add_argument("--minimum_diskGB", type=int, + dest='minimum_diskgb', help="Minimum disk space in GB's") parser.add_argument("--contrail_databases", nargs='+',