Merge "Change section 'DEFAULT' to 'DEFAULTS' in contrail-database-no…

…demgr.conf"
Juniper · Feb 1, 2017 · e3c5253 · e3c5253
2 parents 4aa5e6d + e1d547e
commit e3c5253
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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='+',