diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-05 14:41:51 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-05 14:41:51 -0400 |
commit | 8ebb16fed2e768243a98d5333f9316e570870ce3 (patch) | |
tree | 75fa8b96988553365532b719a24590bb49b59f4b /src/lib/Bcfg2/Server/Plugin/interfaces.py | |
parent | 9fa2293c0bdd71215bc24e371dbd59f0cf922d94 (diff) | |
parent | f8416134cc80d704e6f139aa1ab1ce47e00e4f7f (diff) | |
download | bcfg2-8ebb16fed2e768243a98d5333f9316e570870ce3.tar.gz bcfg2-8ebb16fed2e768243a98d5333f9316e570870ce3.tar.bz2 bcfg2-8ebb16fed2e768243a98d5333f9316e570870ce3.zip |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Core.py
src/lib/Bcfg2/Server/Plugins/GroupLogic.py
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin/interfaces.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin/interfaces.py | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py index 619d72afd..522c6a220 100644 --- a/src/lib/Bcfg2/Server/Plugin/interfaces.py +++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py @@ -221,10 +221,32 @@ class Connector(object): def get_additional_groups(self, metadata): # pylint: disable=W0613 """ Return a list of additional groups for the given client. + Each group can be either the name of a group (a string), or a + :class:`Bcfg2.Server.Plugins.Metadata.MetadataGroup` object + that defines other data besides just the name. Note that you + cannot return a + :class:`Bcfg2.Server.Plugins.Metadata.MetadataGroup` object + that clobbers a group defined by another plugin; the original + group will be used instead. For instance, assume the + following in ``Metadata/groups.xml``: + + .. code-block:: xml + + <Groups> + ... + <Group name="foo" public="false"/> + </Groups> + + You could not subsequently return a + :class:`Bcfg2.Server.Plugins.Metadata.MetadataGroup` object + with ``public=True``; a warning would be issued, and the + original (non-public) ``foo`` group would be used. :param metadata: The client metadata :type metadata: Bcfg2.Server.Plugins.Metadata.ClientMetadata - :return: list of strings + :return: list of strings or + :class:`Bcfg2.Server.Plugins.Metadata.MetadataGroup` + objects. """ return list() |