diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 10:59:12 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 10:59:12 -0400 |
| commit | 86ebb3260c9e1bc77d2f69257576bcbabeba4097 (patch) | |
| tree | 8407f13776c6205202977e5651f3fc093c822843 | |
| parent | 12eaac53025c88e478e1b32280e519f566655da7 (diff) | |
| download | bcfg2-86ebb3260c9e1bc77d2f69257576bcbabeba4097.tar.gz bcfg2-86ebb3260c9e1bc77d2f69257576bcbabeba4097.tar.bz2 bcfg2-86ebb3260c9e1bc77d2f69257576bcbabeba4097.zip | |
Plugins: Fixed/made consistent Django model load
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 5 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 24adee4f4..f27910eb8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -510,6 +510,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata, cf=('communication', 'authentication'), default='cert+password', choices=['cert', 'bootstrap', 'cert+password'], help='Default client authentication method')] + options_parsed_hook = staticmethod(load_django_models) def __init__(self, core, datastore, watch_clients=True): Bcfg2.Server.Plugin.Metadata.__init__(self) @@ -1514,7 +1515,3 @@ class Metadata(Bcfg2.Server.Plugin.Metadata, rv.append('"group-%s" -> "group-%s";' % (group.get('name'), parent.get('name'))) return rv - - @staticmethod - def options_parsed_hook(): - load_django_models() diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index ad9e5a88d..21bb331cd 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -200,7 +200,7 @@ class Probes(Bcfg2.Server.Plugin.Probing, Bcfg2.Options.BooleanOption( cf=('probes', 'use_database'), dest="probes_db", help="Use database capabilities of the Probes plugin")] - options_parsed_hook = load_django_models + options_parsed_hook = staticmethod(load_django_models) def __init__(self, core, datastore): Bcfg2.Server.Plugin.Probing.__init__(self) |