From afeeb2b6430875cc3979ae4ad690d2a3efc0ac68 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 11 May 2012 13:27:07 -0400 Subject: moved plugin-specific configs to main config file; propagate "setup" object to server Core --- src/lib/Bcfg2/Server/Plugins/Rules.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Rules.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Rules.py b/src/lib/Bcfg2/Server/Plugins/Rules.py index b80ef351a..e77d08653 100644 --- a/src/lib/Bcfg2/Server/Plugins/Rules.py +++ b/src/lib/Bcfg2/Server/Plugins/Rules.py @@ -3,9 +3,6 @@ import re import Bcfg2.Server.Plugin -class RulesConfig(Bcfg2.Server.Plugin.SimpleConfig): - _required = False - class Rules(Bcfg2.Server.Plugin.PrioDir): """This is a generator that handles service assignments.""" name = 'Rules' @@ -13,7 +10,6 @@ class Rules(Bcfg2.Server.Plugin.PrioDir): def __init__(self, core, datastore): Bcfg2.Server.Plugin.PrioDir.__init__(self, core, datastore) - self.config = RulesConfig(self) self._regex_cache = dict() def HandlesEntry(self, entry, metadata): @@ -52,4 +48,4 @@ class Rules(Bcfg2.Server.Plugin.PrioDir): return False def _regex_enabled(self): - return self.config.getboolean("rules", "regex", default=False) + return self.core.setup.cfp.getboolean("rules", "regex", default=False) -- cgit v1.2.3-1-g7c22