summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/Metadata.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-02-02 16:38:01 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-02-02 16:38:01 +0000
commit67ea84767b1c06c9efd0449f435cae103cb03fb0 (patch)
treeb08b4ed7cb02086993034879122f978780fcb71d /src/lib/Server/Plugins/Metadata.py
parent527fa203685fc8c93f6094f8cfe61ff4a39f1e2e (diff)
downloadbcfg2-67ea84767b1c06c9efd0449f435cae103cb03fb0.tar.gz
bcfg2-67ea84767b1c06c9efd0449f435cae103cb03fb0.tar.bz2
bcfg2-67ea84767b1c06c9efd0449f435cae103cb03fb0.zip
Split out connector interface to allow for additional data generation based on complete group list
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5055 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Metadata.py')
-rw-r--r--src/lib/Server/Plugins/Metadata.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
index df7e3ddf2..f63e2d558 100644
--- a/src/lib/Server/Plugins/Metadata.py
+++ b/src/lib/Server/Plugins/Metadata.py
@@ -395,7 +395,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
newcategories, uuid, password,
(groupscopy, clientscopy))
- def merge_additional_metadata(self, imd, source, groups, data):
+ def merge_additional_groups(self, imd, groups):
for group in groups:
if group in self.categories and \
self.categories[group] in imd.categories:
@@ -410,9 +410,11 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
self.categories[g] in imd.categories:
continue
imd.groups.append(g)
+
+ def merge_additional_data(self, imd, source, data):
if not hasattr(imd, source):
setattr(imd, source, data)
- imd.connectors.append(source)
+ imd.connectors.append(source)
def AuthenticateConnection(self, user, password, address):
'''This function checks user and password'''