Options: migrated plugins to new options parser

8 files changed, 89 insertions, 177 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgAuthorizedKeysGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgAuthorizedKeysGenerator.py
index a859da0ba..50de498e6 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgAuthorizedKeysGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgAuthorizedKeysGenerator.py
@@ -3,6 +3,7 @@ based on an XML specification of which SSH keypairs should granted
 access. """
 
 import lxml.etree
+import Bcfg2.Options
 from Bcfg2.Server.Plugin import StructFile, PluginExecutionError
 from Bcfg2.Server.Plugins.Cfg import CfgGenerator, CFG
 from Bcfg2.Server.Plugins.Metadata import ClientMetadata
@@ -27,15 +28,6 @@ class CfgAuthorizedKeysGenerator(CfgGenerator, StructFile):
         self.core = CFG.core
     __init__.__doc__ = CfgGenerator.__init__.__doc__
 
-    @property
-    def category(self):
-        """ The name of the metadata category that generated keys are
-        specific to """
-        if (self.setup.cfp.has_section("sshkeys") and
-            self.setup.cfp.has_option("sshkeys", "category")):
-            return self.setup.cfp.get("sshkeys", "category")
-        return None
-
     def handle_event(self, event):
         CfgGenerator.handle_event(self, event)
         StructFile.HandleEvent(self, event)
@@ -61,12 +53,13 @@ class CfgAuthorizedKeysGenerator(CfgGenerator, StructFile):
                     key_md = ClientMetadata("dummy", group, [group], [],
                                             set(), set(), dict(), None,
                                             None, None, None)
-                elif (self.category and
-                      not metadata.group_in_category(self.category)):
+                elif (Bcfg2.Options.setup.sshkeys_category and
+                      not metadata.group_in_category(
+                        Bcfg2.Options.setup.sshkeys_category)):
                     self.logger.warning("Cfg: %s ignoring Allow from %s: "
                                         "No group in category %s" %
                                         (metadata.hostname, pubkey_name,
-                                         self.category))
+                                         Bcfg2.Options.setup.sshkeys_category))
                     continue
                 else:
                     key_md = metadata
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py
index 4c8adceec..476dc1fc6 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py
@@ -2,6 +2,7 @@
 <http://www.cheetahtemplate.org/>`_ templating system to generate
 :ref:`server-plugins-generators-cfg` files. """
 
+import Bcfg2.Options
 from Bcfg2.Server.Plugin import PluginExecutionError
 from Bcfg2.Server.Plugins.Cfg import CfgGenerator
 
@@ -27,19 +28,19 @@ class CfgCheetahGenerator(CfgGenerator):
     #: :class:`Cheetah.Template.Template` compiler settings
     settings = dict(useStackFrames=False)
 
-    def __init__(self, fname, spec, encoding):
-        CfgGenerator.__init__(self, fname, spec, encoding)
+    def __init__(self, fname, spec):
+        CfgGenerator.__init__(self, fname, spec)
         if not HAS_CHEETAH:
             raise PluginExecutionError("Cheetah is not available")
     __init__.__doc__ = CfgGenerator.__init__.__doc__
 
     def get_data(self, entry, metadata):
-        template = Template(self.data.decode(self.encoding),
+        template = Template(self.data.decode(Bcfg2.Options.setup.encoding),
                             compilerSettings=self.settings)
         template.metadata = metadata
         template.name = entry.get('realname', entry.get('name'))
         template.path = entry.get('realname', entry.get('name'))
         template.source_path = self.name
-        template.repo = self.setup['repo']
+        template.repo = Bcfg2.Options.setup.repository
         return template.respond()
     get_data.__doc__ = CfgGenerator.get_data.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
index 516eba2f6..e2a2f696a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
@@ -21,8 +21,8 @@ class CfgEncryptedGenerator(CfgGenerator):
     #: .genshi.crypt and .cheetah.crypt files
     __priority__ = 50
 
-    def __init__(self, fname, spec, encoding):
-        CfgGenerator.__init__(self, fname, spec, encoding)
+    def __init__(self, fname, spec):
+        CfgGenerator.__init__(self, fname, spec)
         if not HAS_CRYPTO:
             raise PluginExecutionError("M2Crypto is not available")
     __init__.__doc__ = CfgGenerator.__init__.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
index 0521485e8..f69ab8e5f 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
@@ -37,7 +37,7 @@ class CfgEncryptedGenshiGenerator(CfgGenshiGenerator):
     #: when it's read in
     __loader_cls__ = EncryptedTemplateLoader
 
-    def __init__(self, fname, spec, encoding):
-        CfgGenshiGenerator.__init__(self, fname, spec, encoding)
+    def __init__(self, fname, spec):
+        CfgGenshiGenerator.__init__(self, fname, spec)
         if not HAS_CRYPTO:
             raise PluginExecutionError("M2Crypto is not available")
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py
index d06b864ac..953473a12 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgExternalCommandVerifier.py
@@ -15,8 +15,8 @@ class CfgExternalCommandVerifier(CfgVerifier):
     #: Handle :file:`:test` files
     __basenames__ = [':test']
 
-    def __init__(self, name, specific, encoding):
-        CfgVerifier.__init__(self, name, specific, encoding)
+    def __init__(self, name, specific):
+        CfgVerifier.__init__(self, name, specific)
         self.cmd = []
         self.exc = Executor(timeout=30)
     __init__.__doc__ = CfgVerifier.__init__.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
index e056c871a..7ba8c4491 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
@@ -5,9 +5,9 @@
 import re
 import sys
 import traceback
+import Bcfg2.Options
 from Bcfg2.Server.Plugin import PluginExecutionError, removecomment
 from Bcfg2.Server.Plugins.Cfg import CfgGenerator
-
 from genshi.template import TemplateLoader, NewTextTemplate
 from genshi.template.eval import UndefinedError, Suite
 
@@ -70,8 +70,8 @@ class CfgGenshiGenerator(CfgGenerator):
     #: occurred.
     pyerror_re = re.compile(r'<\w+ u?[\'"](.*?)\s*\.\.\.[\'"]>')
 
-    def __init__(self, fname, spec, encoding):
-        CfgGenerator.__init__(self, fname, spec, encoding)
+    def __init__(self, fname, spec):
+        CfgGenerator.__init__(self, fname, spec)
         self.template = None
         self.loader = self.__loader_cls__(max_cache_size=0)
     __init__.__doc__ = CfgGenerator.__init__.__doc__
@@ -87,13 +87,15 @@ class CfgGenshiGenerator(CfgGenerator):
             metadata=metadata,
             path=self.name,
             source_path=self.name,
-            repo=self.setup['repo']).filter(removecomment)
+            repo=Bcfg2.Options.setup.repository).filter(removecomment)
         try:
             try:
-                return stream.render('text', encoding=self.encoding,
+                return stream.render('text',
+                                     encoding=Bcfg2.Options.setup.encoding,
                                      strip_whitespace=False)
             except TypeError:
-                return stream.render('text', encoding=self.encoding)
+                return stream.render('text',
+                                     encoding=Bcfg2.Options.setup.encoding)
         except UndefinedError:
             # a failure in a genshi expression _other_ than %{ python ... %}
             err = sys.exc_info()[1]
@@ -172,8 +174,9 @@ class CfgGenshiGenerator(CfgGenerator):
     def handle_event(self, event):
         CfgGenerator.handle_event(self, event)
         try:
-            self.template = self.loader.load(self.name, cls=NewTextTemplate,
-                                             encoding=self.encoding)
+            self.template = \
+                self.loader.load(self.name, cls=NewTextTemplate,
+                                 encoding=Bcfg2.Options.setup.encoding)
         except:
             raise PluginExecutionError("Failed to load template: %s" %
                                        sys.exc_info()[1])
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
index 862726788..7bb5d3cf5 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
@@ -3,8 +3,8 @@
 import os
 import shutil
 import tempfile
+import Bcfg2.Options
 from Bcfg2.Utils import Executor
-from Bcfg2.Options import get_option_parser
 from Bcfg2.Server.Plugin import StructFile
 from Bcfg2.Server.Plugins.Cfg import CfgCreator, CfgCreationError
 from Bcfg2.Server.Plugins.Cfg.CfgPublicKeyCreator import CfgPublicKeyCreator
@@ -25,6 +25,14 @@ class CfgPrivateKeyCreator(CfgCreator, StructFile):
     #: Handle XML specifications of private keys
     __basenames__ = ['privkey.xml']
 
+    options = [
+        Bcfg2.Options.Option(
+            cf=("sshkeys", "category"), dest="sshkeys_category",
+            help="Metadata category that generated SSH keys are specific to"),
+        Bcfg2.Options.Option(
+            cf=("sshkeys", "passphrase"), dest="sshkeys_passphrase",
+            help="Passphrase used to encrypt generated SSH private keys")]
+
     def __init__(self, fname):
         CfgCreator.__init__(self, fname)
         StructFile.__init__(self, fname)
@@ -32,27 +40,15 @@ class CfgPrivateKeyCreator(CfgCreator, StructFile):
         pubkey_path = os.path.dirname(self.name) + ".pub"
         pubkey_name = os.path.join(pubkey_path, os.path.basename(pubkey_path))
         self.pubkey_creator = CfgPublicKeyCreator(pubkey_name)
-        self.setup = get_option_parser()
         self.cmd = Executor()
     __init__.__doc__ = CfgCreator.__init__.__doc__
 
     @property
-    def category(self):
-        """ The name of the metadata category that generated keys are
-        specific to """
-        if (self.setup.cfp.has_section("sshkeys") and
-            self.setup.cfp.has_option("sshkeys", "category")):
-            return self.setup.cfp.get("sshkeys", "category")
-        return None
-
-    @property
     def passphrase(self):
         """ The passphrase used to encrypt private keys """
-        if (HAS_CRYPTO and
-            self.setup.cfp.has_section("sshkeys") and
-            self.setup.cfp.has_option("sshkeys", "passphrase")):
-            return Bcfg2.Server.Encryption.get_passphrases()[
-                self.setup.cfp.get("sshkeys", "passphrase")]
+        if HAS_CRYPTO and Bcfg2.Options.setup.sshkeys_passphrase:
+            return Bcfg2.Options.setup.passphrases[
+                Bcfg2.Options.setup.sshkeys_passphrase]
         return None
 
     def handle_event(self, event):
@@ -141,7 +137,7 @@ class CfgPrivateKeyCreator(CfgCreator, StructFile):
         """
         if spec is None:
             spec = self.XMLMatch(metadata)
-        category = spec.get("category", self.category)
+        category = spec.get("category", Bcfg2.Options.setup.sshkeys_category)
         if category is None:
             per_host_default = "true"
         else:
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index 8a787751c..ed349c87c 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -3,17 +3,14 @@
 import re
 import os
 import sys
-import stat
 import errno
 import operator
 import lxml.etree
 import Bcfg2.Options
 import Bcfg2.Server.Plugin
-import Bcfg2.Server.Lint
 from Bcfg2.Server.Plugin import PluginExecutionError
 # pylint: disable=W0622
-from Bcfg2.Compat import u_str, unicode, b64encode, walk_packages, \
-    any, oct_mode
+from Bcfg2.Compat import u_str, unicode, b64encode, any, oct_mode
 # pylint: enable=W0622
 
 #: CFG is a reference to the :class:`Bcfg2.Server.Plugins.Cfg.Cfg`
@@ -24,27 +21,8 @@ from Bcfg2.Compat import u_str, unicode, b64encode, walk_packages, \
 #: facility for passing it otherwise.
 CFG = None
 
-_HANDLERS = []
 
-
-def handlers():
-    """ A list of Cfg handler classes. Loading the handlers must
-    be done at run-time, not at compile-time, or it causes a
-    circular import and Bad Things Happen."""
-    if not _HANDLERS:
-        for submodule in walk_packages(path=__path__, prefix=__name__ + "."):
-            mname = submodule[1].rsplit('.', 1)[-1]
-            module = getattr(__import__(submodule[1]).Server.Plugins.Cfg,
-                             mname)
-            hdlr = getattr(module, mname)
-            if issubclass(hdlr, CfgBaseFileMatcher):
-                _HANDLERS.append(hdlr)
-        _HANDLERS.sort(key=operator.attrgetter("__priority__"))
-    return _HANDLERS
-
-
-class CfgBaseFileMatcher(Bcfg2.Server.Plugin.SpecificData,
-                         Bcfg2.Server.Plugin.Debuggable):
+class CfgBaseFileMatcher(Bcfg2.Server.Plugin.SpecificData):
     """ .. currentmodule:: Bcfg2.Server.Plugins.Cfg
 
     CfgBaseFileMatcher is the parent class for all Cfg handler
@@ -88,12 +66,8 @@ class CfgBaseFileMatcher(Bcfg2.Server.Plugin.SpecificData,
     #: Flag to indicate an experimental handler.
     experimental = False
 
-    def __init__(self, name, specific, encoding):
-        Bcfg2.Server.Plugin.SpecificData.__init__(self, name, specific,
-                                                  encoding)
-        Bcfg2.Server.Plugin.Debuggable.__init__(self)
-        self.encoding = encoding
-        self.setup = Bcfg2.Options.get_option_parser()
+    def __init__(self, name, specific):
+        Bcfg2.Server.Plugin.SpecificData.__init__(self, name, specific)
     __init__.__doc__ = Bcfg2.Server.Plugin.SpecificData.__init__.__doc__ + \
         """
 .. -----
@@ -184,7 +158,7 @@ class CfgGenerator(CfgBaseFileMatcher):
     client. See :class:`Bcfg2.Server.Plugin.helpers.EntrySet` for more
     details on how the best handler is chosen."""
 
-    def __init__(self, name, specific, encoding):
+    def __init__(self, name, specific):
         # we define an __init__ that just calls the parent __init__,
         # so that we can set the docstring on __init__ to something
         # different from the parent __init__ -- namely, the parent
@@ -192,7 +166,7 @@ class CfgGenerator(CfgBaseFileMatcher):
         # which we use to delineate the actual docs from the
         # .. autoattribute hacks we have to do to get private
         # attributes included in sphinx 1.0 """
-        CfgBaseFileMatcher.__init__(self, name, specific, encoding)
+        CfgBaseFileMatcher.__init__(self, name, specific)
     __init__.__doc__ = CfgBaseFileMatcher.__init__.__doc__.split(".. -----")[0]
 
     def get_data(self, entry, metadata):  # pylint: disable=W0613
@@ -212,9 +186,9 @@ class CfgFilter(CfgBaseFileMatcher):
     """ CfgFilters modify the initial content of a file after it has
     been generated by a :class:`Bcfg2.Server.Plugins.Cfg.CfgGenerator`. """
 
-    def __init__(self, name, specific, encoding):
+    def __init__(self, name, specific):
         # see comment on CfgGenerator.__init__ above
-        CfgBaseFileMatcher.__init__(self, name, specific, encoding)
+        CfgBaseFileMatcher.__init__(self, name, specific)
     __init__.__doc__ = CfgBaseFileMatcher.__init__.__doc__.split(".. -----")[0]
 
     def modify_data(self, entry, metadata, data):
@@ -252,7 +226,7 @@ class CfgInfo(CfgBaseFileMatcher):
         .. -----
         .. autoattribute:: Bcfg2.Server.Plugins.Cfg.CfgInfo.__specific__
         """
-        CfgBaseFileMatcher.__init__(self, fname, None, None)
+        CfgBaseFileMatcher.__init__(self, fname, None)
 
     def bind_info_to_entry(self, entry, metadata):
         """ Assign the appropriate attributes to the entry, modifying
@@ -275,9 +249,9 @@ class CfgVerifier(CfgBaseFileMatcher):
     etc.), or both.
     """
 
-    def __init__(self, name, specific, encoding):
+    def __init__(self, name, specific):
         # see comment on CfgGenerator.__init__ above
-        CfgBaseFileMatcher.__init__(self, name, specific, encoding)
+        CfgBaseFileMatcher.__init__(self, name, specific)
     __init__.__doc__ = CfgBaseFileMatcher.__init__.__doc__.split(".. -----")[0]
 
     def verify_entry(self, entry, metadata, data):
@@ -316,7 +290,7 @@ class CfgCreator(CfgBaseFileMatcher):
         .. -----
         .. autoattribute:: Bcfg2.Server.Plugins.Cfg.CfgCreator.__specific__
         """
-        CfgBaseFileMatcher.__init__(self, fname, None, None)
+        CfgBaseFileMatcher.__init__(self, fname, None)
 
     def create_data(self, entry, metadata):
         """ Create new data for the given entry and write it to disk
@@ -430,26 +404,31 @@ class CfgDefaultInfo(CfgInfo):
     bind_info_to_entry.__doc__ = CfgInfo.bind_info_to_entry.__doc__
 
 
-class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
-                  Bcfg2.Server.Plugin.Debuggable):
+class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
     """ Handle a collection of host- and group-specific Cfg files with
     multiple different Cfg handlers in a single directory. """
 
-    def __init__(self, basename, path, entry_type, encoding):
-        Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path,
-                                              entry_type, encoding)
-        Bcfg2.Server.Plugin.Debuggable.__init__(self)
+    def __init__(self, basename, path, entry_type):
+        Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path, entry_type)
         self.specific = None
         self._handlers = None
-        self.setup = Bcfg2.Options.get_option_parser()
     __init__.__doc__ = Bcfg2.Server.Plugin.EntrySet.__doc__
 
+
     def set_debug(self, debug):
-        rv = Bcfg2.Server.Plugin.Debuggable.set_debug(self, debug)
+        rv = Bcfg2.Server.Plugin.EntrySet.set_debug(self, debug)
         for entry in self.entries.values():
             entry.set_debug(debug)
         return rv
 
+    @property
+    def handlers(self):
+        """ A list of Cfg handler classes. """
+        if self._handlers is None:
+            self._handlers = Bcfg2.Options.setup.cfg_handlers
+            self._handlers.sort(key=operator.attrgetter("__priority__"))
+        return self._handlers
+
     def handle_event(self, event):
         """ Dispatch a FAM event to :func:`entry_init` or the
         appropriate child handler object.
@@ -466,7 +445,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
                 # process a bogus changed event like a created
                 return
 
-            for hdlr in handlers():
+            for hdlr in self.handlers:
                 if hdlr.handles(event, basename=self.path):
                     if action == 'changed':
                         # warn about a bogus 'changed' event, but
@@ -559,7 +538,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
                     # most specific to least specific.
                     data = fltr.modify_data(entry, metadata, data)
 
-        if self.setup['validate']:
+        if Bcfg2.Options.setup.cfg_validation:
             try:
                 self._validate_data(entry, metadata, data)
             except CfgVerificationError:
@@ -575,7 +554,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
                 if not isinstance(data, unicode):
                     if not isinstance(data, str):
                         data = data.decode('utf-8')
-                    data = u_str(data, self.encoding)
+                    data = u_str(data, Bcfg2.Options.setup.encoding)
             except UnicodeDecodeError:
                 msg = "Failed to decode %s: %s" % (entry.get('name'),
                                                    sys.exc_info()[1])
@@ -756,10 +735,10 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
                 self.logger.error(msg)
                 raise PluginExecutionError(msg)
             try:
-                etext = new_entry['text'].encode(self.encoding)
+                etext = new_entry['text'].encode(Bcfg2.Options.setup.encoding)
             except:
                 msg = "Cfg: Cannot encode content of %s as %s" % \
-                    (name, self.encoding)
+                    (name, Bcfg2.Options.setup.encoding)
                 self.logger.error(msg)
                 raise PluginExecutionError(msg)
             open(name, 'w').write(etext)
@@ -784,6 +763,10 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
                            flag=log)
 
 
+class CfgHandlerAction(Bcfg2.Options.ComponentAction):
+    bases = ['Bcfg2.Server.Plugins.Cfg']
+
+
 class Cfg(Bcfg2.Server.Plugin.GroupSpool,
           Bcfg2.Server.Plugin.PullTarget):
     """ The Cfg plugin provides a repository to describe configuration
@@ -795,17 +778,27 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool,
     es_cls = CfgEntrySet
     es_child_cls = Bcfg2.Server.Plugin.SpecificData
 
+    options = Bcfg2.Server.Plugin.GroupSpool.options + [
+        Bcfg2.Options.BooleanOption(
+           '--cfg-validation', cf=('cfg', 'validation'), default=True,
+           help='Run validation on Cfg files'),
+        Bcfg2.Options.Option(
+            cf=("cfg", "handlers"), dest="cfg_handlers",
+            help="Cfg handlers to load",
+            type=Bcfg2.Options.Types.comma_list, action=CfgHandlerAction,
+            default=['CfgAuthorizedKeysGenerator', 'CfgEncryptedGenerator',
+                     'CfgCheetahGenerator', 'CfgEncryptedCheetahGenerator',
+                     'CfgGenshiGenerator', 'CfgEncryptedGenshiGenerator',
+                     'CfgExternalCommandVerifier', 'CfgInfoXML',
+                     'CfgPlaintextGenerator',
+                     'CfgPrivateKeyCreator', 'CfgPublicKeyCreator'])]
+
     def __init__(self, core, datastore):
         global CFG  # pylint: disable=W0603
         Bcfg2.Server.Plugin.GroupSpool.__init__(self, core, datastore)
         Bcfg2.Server.Plugin.PullTarget.__init__(self)
 
         CFG = self
-
-        setup = Bcfg2.Options.get_option_parser()
-        if 'validate' not in setup:
-            setup.add_option('validate', Bcfg2.Options.CFG_VALIDATION)
-            setup.reparse()
     __init__.__doc__ = Bcfg2.Server.Plugin.GroupSpool.__init__.__doc__
 
     def has_generator(self, entry, metadata):
@@ -839,77 +832,3 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool,
                                                                 log)
     AcceptPullData.__doc__ = \
         Bcfg2.Server.Plugin.PullTarget.AcceptPullData.__doc__
-
-
-class CfgLint(Bcfg2.Server.Lint.ServerPlugin):
-    """ warn about usage of .cat and .diff files """
-
-    def Run(self):
-        for basename, entry in list(self.core.plugins['Cfg'].entries.items()):
-            self.check_pubkey(basename, entry)
-        self.check_missing_files()
-
-    @classmethod
-    def Errors(cls):
-        return {"no-pubkey-xml": "warning",
-                "unknown-cfg-files": "error",
-                "extra-cfg-files": "error"}
-
-    def check_pubkey(self, basename, entry):
-        """ check that privkey.xml files have corresponding pubkey.xml
-        files """
-        if "privkey.xml" not in entry.entries:
-            return
-        privkey = entry.entries["privkey.xml"]
-        if not self.HandlesFile(privkey.name):
-            return
-
-        pubkey = basename + ".pub"
-        if pubkey not in self.core.plugins['Cfg'].entries:
-            self.LintError("no-pubkey-xml",
-                           "%s has no corresponding pubkey.xml at %s" %
-                           (basename, pubkey))
-        else:
-            pubset = self.core.plugins['Cfg'].entries[pubkey]
-            if "pubkey.xml" not in pubset.entries:
-                self.LintError("no-pubkey-xml",
-                               "%s has no corresponding pubkey.xml at %s" %
-                               (basename, pubkey))
-
-    def check_missing_files(self):
-        """ check that all files on the filesystem are known to Cfg """
-        cfg = self.core.plugins['Cfg']
-
-        # first, collect ignore patterns from handlers
-        ignore = []
-        for hdlr in handlers():
-            ignore.extend(hdlr.__ignore__)
-
-        # next, get a list of all non-ignored files on the filesystem
-        all_files = set()
-        for root, _, files in os.walk(cfg.data):
-            all_files.update(os.path.join(root, fname)
-                             for fname in files
-                             if not any(fname.endswith("." + i)
-                                        for i in ignore))
-
-        # next, get a list of all files known to Cfg
-        cfg_files = set()
-        for root, eset in cfg.entries.items():
-            cfg_files.update(os.path.join(cfg.data, root.lstrip("/"), fname)
-                             for fname in eset.entries.keys())
-
-        # finally, compare the two
-        unknown_files = all_files - cfg_files
-        extra_files = cfg_files - all_files
-        if unknown_files:
-            self.LintError(
-                "unknown-cfg-files",
-                "Files on the filesystem could not be understood by Cfg: %s" %
-                "; ".join(unknown_files))
-        if extra_files:
-            self.LintError(
-                "extra-cfg-files",
-                "Cfg has entries for files that do not exist on the "
-                "filesystem: %s\nThis is probably a bug." %
-                "; ".join(extra_files))