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>

3 files changed, 75 insertions, 1 deletions

diff --git a/doc/server/admin/index.txt b/doc/server/admin/index.txt
new file mode 100644
index 000000000..43c71a933
--- /dev/null
+++ b/doc/server/admin/index.txt
@@ -0,0 +1,72 @@
+.. -*- mode: rst -*-
+
+.. _server-admin-index:
+
+=====
+Admin
+=====
+
+The ``bcfg2-admin`` command provides you an interface which allows you
+to interact with your Bcfg2 repository in an administrative fashion. To
+get started, run ``bcfg2-admin help``. You will be presented with a list
+of different *modes* which each provide various administrative
+functionality. Available modes are listed below.
+
+FIXME: Need examples for each command listed below.
+
+client
+======
+
+Create, delete, or modify client entries.
+
+compare
+=======
+
+Determine differences between files or directories of client
+specification instances.
+
+init
+====
+
+Interactively initialize a new repository.
+
+minestruct
+==========
+
+Extract extra entry lists from statistics.
+
+perf
+====
+
+Query server for performance data.
+
+pull
+====
+
+Integrate configuration information from clients into the server
+repository.
+
+query
+=====
+
+Query clients.
+
+snapshots
+=========
+
+Interact with the Snapshots system.
+
+tidy
+====
+
+Clean up useless files in the repo.
+
+viz
+===
+
+Produce graphviz diagrams of metadata structures.
+
+xcmd
+====
+
+XML-RPC Command Interface.
diff --git a/doc/server/index.txt b/doc/server/index.txt
index b81f9ede4..9c351c652 100644
--- a/doc/server/index.txt
+++ b/doc/server/index.txt
@@ -10,6 +10,7 @@ Bcfg2 Server
    :maxdepth: 2
 
    plugins/index
+   admin/index
    reports/index
    configurationentries
    snapshots/index
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:])