diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-21 07:59:01 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-21 07:59:01 -0400 |
| commit | a751399fb77aaeee0312a9ee381257408b317da8 (patch) | |
| tree | 70b4236377885f044306b2f958e056c3562cc83e /src/lib/Bcfg2 | |
| parent | 48c584194e4e5ec4b3561b2d6448ba4728ab0739 (diff) | |
| download | bcfg2-a751399fb77aaeee0312a9ee381257408b317da8.tar.gz bcfg2-a751399fb77aaeee0312a9ee381257408b317da8.tar.bz2 bcfg2-a751399fb77aaeee0312a9ee381257408b317da8.zip | |
Packages: deprecated magic groups, disabled by default
Diffstat (limited to 'src/lib/Bcfg2')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Source.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py index ee81b9031..26f3ab92f 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py @@ -727,7 +727,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable): return False if not self.setup.cfp.getboolean("packages", "magic_groups", - default=True): + default=False): return True else: for group in self.basegroups: diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index e5b53cb26..fd6369619 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -60,6 +60,14 @@ class Packages(Bcfg2.Server.Plugin.Plugin, # create key directory if needed os.makedirs(self.keypath) + # warn about deprecated magic groups + if self.core.setup.cfp.getboolean("packages", "magic_groups", + default=False): + self.logger.warning("Packages: Magic groups are deprecated and " + "will be removed in a future release") + self.logger.warning("You can disable magic groups by setting " + "magic_groups=0 in [packages] in bcfg2.conf") + #: The #: :class:`Bcfg2.Server.Plugins.Packages.PackagesSources.PackagesSources` #: object used to generate @@ -215,7 +223,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, """ if entry.tag == 'Package': if self.core.setup.cfp.getboolean("packages", "magic_groups", - default=True): + default=False): collection = self._get_collection(metadata) if collection.magic_groups_match(): return True |