diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-08 08:53:04 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-08 08:53:04 -0500 |
commit | 9f9154ac946da3b56b499041c0acd9f1499334f0 (patch) | |
tree | ed520f171d0204a17f82254814a8724dbfef5fd1 /src/lib/Server/Plugins | |
parent | a95c365f39d983986e1a69e8396101e87ff08abb (diff) | |
download | bcfg2-9f9154ac946da3b56b499041c0acd9f1499334f0.tar.gz bcfg2-9f9154ac946da3b56b499041c0acd9f1499334f0.tar.bz2 bcfg2-9f9154ac946da3b56b499041c0acd9f1499334f0.zip |
Metadata: set ClientMetadata categories based on groups from Connectors as well
Diffstat (limited to 'src/lib/Server/Plugins')
-rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index 4f0ca9686..4abcf8e4e 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -695,6 +695,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, self.logger.error("Refusing to add dynamic membership in private group %s for client %s" % (g, imd.hostname)) continue imd.groups.add(g) + if g in self.categories: + imd.categories[self.categories[g]] = g def merge_additional_data(self, imd, source, data): if not hasattr(imd, source): @@ -820,7 +822,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, def include_group(group): return not only_client or group in clientmeta.groups - + groups_tree = lxml.etree.parse(self.data + "/groups.xml", parser=Bcfg2.Server.XMLParser) try: |