diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2007-12-31 11:21:10 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2007-12-31 11:21:10 +0000 |
commit | ef5051726a3aa1f0192bd8d99c5c5b1ee9f067af (patch) | |
tree | 57bf0854d95c18cced379921657f746ad5faab04 /src/sbin/bcfg2-admin | |
parent | 104a1e27cee2d5524460d26c83d3e920cd88b2e9 (diff) | |
download | bcfg2-ef5051726a3aa1f0192bd8d99c5c5b1ee9f067af.tar.gz bcfg2-ef5051726a3aa1f0192bd8d99c5c5b1ee9f067af.tar.bz2 bcfg2-ef5051726a3aa1f0192bd8d99c5c5b1ee9f067af.zip |
Switch over to more Options usage and complete tests (everything appears to work now)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4142 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-admin')
-rwxr-xr-x | src/sbin/bcfg2-admin | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index ba979ec3b..fb9a58c7d 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -3,7 +3,6 @@ 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') @@ -19,7 +18,8 @@ def mode_import(modename): if __name__ == '__main__': Bcfg2.Logging.setup_logging('bcfg2-admin', to_console=True) - configfile = settings.CONFIG_FILE + # Some sensible defaults + configfile = "/etc/bcfg2.conf" try: opts, args = getopt.getopt(sys.argv[1:], 'hC:', ['help', 'configfile=']) @@ -36,9 +36,6 @@ 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') @@ -55,8 +52,7 @@ if __name__ == '__main__': mode_cls = mode_import(modname) except ImportError, e: log.error("Failed to load admin mod %s: %s" % (modname, e)) - raise SystemExit(0) - mode = mode_cls() + mode = mode_cls(configfile) mode(args[1:]) else: print "unknown mode %s" % args[0] |