diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-13 09:31:49 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-13 09:31:49 -0400 |
| commit | da0918e71e82c407e1dc7f5cb80f33cad93263af (patch) | |
| tree | f91255bdd8019aee0ac60de69e42eee56335d180 /src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | |
| parent | 5c5edfa9b3a2f3baad06802269e7acd1d3e77566 (diff) | |
| download | bcfg2-da0918e71e82c407e1dc7f5cb80f33cad93263af.tar.gz bcfg2-da0918e71e82c407e1dc7f5cb80f33cad93263af.tar.bz2 bcfg2-da0918e71e82c407e1dc7f5cb80f33cad93263af.zip | |
testsuite: fixed unit tests for new SSLCA stuff
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 21dc35e5a..eea0a3456 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -10,7 +10,7 @@ import Bcfg2.Options import Bcfg2.Server.Plugin from Bcfg2.Server.Plugin import PluginExecutionError # pylint: disable=W0622 -from Bcfg2.Compat import u_str, unicode, b64encode, any +from Bcfg2.Compat import u_str, unicode, b64encode, any, walk_packages # pylint: enable=W0622 try: @@ -19,9 +19,12 @@ try: except ImportError: HAS_CRYPTO = False +_handlers = [m[1] # pylint: disable=C0103 + for m in walk_packages(path=__path__)] _CFG = None + def get_cfg(): """ Get the :class:`Bcfg2.Server.Plugins.Cfg.Cfg` plugin object created by the Bcfg2 core. This is provided so that the handler @@ -888,13 +891,7 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool, 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', - 'CfgSSLCACertCreator', 'CfgSSLCAKeyCreator'])] + default=_handlers)] def __init__(self, core, datastore): global _CFG # pylint: disable=W0603 |