summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Admin
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2010-04-07 14:07:45 -0500
committerSol Jerome <solj@ices.utexas.edu>2010-04-07 14:07:45 -0500
commit71fa90c2ad9739848049b49c48e94ae1572b999b (patch)
treef6d2f547068c8c3561f9925725082aef9b181d64 /src/lib/Server/Admin
parent17f6bd88475ad7bbb97e29f1488a47f1a25df998 (diff)
downloadbcfg2-71fa90c2ad9739848049b49c48e94ae1572b999b.tar.gz
bcfg2-71fa90c2ad9739848049b49c48e94ae1572b999b.tar.bz2
bcfg2-71fa90c2ad9739848049b49c48e94ae1572b999b.zip
Fix configfile option for bcfg2-admin (Patch from Duncan Hutty)
Also added a document describing various admin modes (needs to be fleshed out). Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
Diffstat (limited to 'src/lib/Server/Admin')
-rw-r--r--src/lib/Server/Admin/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py
index 8ce3472fb..89415cf9f 100644
--- a/src/lib/Server/Admin/__init__.py
+++ b/src/lib/Server/Admin/__init__.py
@@ -89,7 +89,8 @@ class MetadataCore(Mode):
'''Base class for admin-modes that handle metadata'''
def __init__(self, configfile, usage, pwhitelist=None, pblacklist=None):
Mode.__init__(self, configfile)
- options = {'plugins': Bcfg2.Options.SERVER_PLUGINS}
+ options = {'plugins': Bcfg2.Options.SERVER_PLUGINS,
+ 'configfile': Bcfg2.Options.CFILE}
setup = Bcfg2.Options.OptionParser(options)
setup.hm = usage
setup.parse(sys.argv[1:])