summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Probes.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-09 11:25:15 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-09 11:52:20 -0400
commit1b6394708b267bcc9230fbb77e0fd4ad51f456b8 (patch)
tree479b5fc50c58f73abb871605836f0159958b450c /src/lib/Bcfg2/Server/Plugins/Probes.py
parentc8ca57745a5ba5859ade9f36cd57b80210cc01f8 (diff)
downloadbcfg2-1b6394708b267bcc9230fbb77e0fd4ad51f456b8.tar.gz
bcfg2-1b6394708b267bcc9230fbb77e0fd4ad51f456b8.tar.bz2
bcfg2-1b6394708b267bcc9230fbb77e0fd4ad51f456b8.zip
DatabaseBacked interface needs to be a Plugin object
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Probes.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 114a9bbd8..53deefebd 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -152,8 +152,7 @@ class ProbeSet(Bcfg2.Server.Plugin.EntrySet):
return ret
-class Probes(Bcfg2.Server.Plugin.Plugin,
- Bcfg2.Server.Plugin.Probing,
+class Probes(Bcfg2.Server.Plugin.Probing,
Bcfg2.Server.Plugin.Connector,
Bcfg2.Server.Plugin.DatabaseBacked):
"""A plugin to gather information from a client machine."""
@@ -161,10 +160,9 @@ class Probes(Bcfg2.Server.Plugin.Plugin,
__author__ = 'bcfg-dev@mcs.anl.gov'
def __init__(self, core, datastore):
- Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
Bcfg2.Server.Plugin.Connector.__init__(self)
Bcfg2.Server.Plugin.Probing.__init__(self)
- Bcfg2.Server.Plugin.DatabaseBacked.__init__(self)
+ Bcfg2.Server.Plugin.DatabaseBacked.__init__(self, core, datastore)
try:
self.probes = ProbeSet(self.data, core.fam, core.encoding,