bcfg2-admin: use Bcfg2.Settings

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4133 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 6 insertions, 1 deletions

diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index fb9a58c7d..152edc62d 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -3,6 +3,7 @@
 
 import getopt, difflib, logging, lxml.etree, os, popen2, re, socket, sys, ConfigParser
 import Bcfg2.Server.Core, Bcfg2.Logging
+from Bcfg2.Settings import settings
 
 log = logging.getLogger('bcfg-admin')
 
@@ -36,6 +37,9 @@ if __name__ == '__main__':
         if opt in ("-C", "--configfile"):
             configfile = arg
 
+    # override default settings
+    settings.read_config_file(configfile)
+
     modes = [x.lower() for x in Bcfg2.Server.Admin.__all__]
     modes.remove('mode')
 
@@ -52,7 +56,8 @@ if __name__ == '__main__':
             mode_cls = mode_import(modname)
         except ImportError, e:
             log.error("Failed to load admin mod %s: %s" % (modname, e))
-        mode = mode_cls(configfile)
+            raise SystemExit(0)
+        mode = mode_cls()
         mode(args[1:])
     else:
         print "unknown mode %s" % args[0]