summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/AWSTags.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-10-28 10:20:05 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-10-28 10:20:05 -0400
commit9dc02381c1f2c23a656d45390d12890318d574f4 (patch)
tree9472e9ffd805e297444e024b45fbc0261c3720df /src/lib/Bcfg2/Server/Plugins/AWSTags.py
parent56ed0fffa88e84dc6845202d58e91bb90641b1e2 (diff)
downloadbcfg2-9dc02381c1f2c23a656d45390d12890318d574f4.tar.gz
bcfg2-9dc02381c1f2c23a656d45390d12890318d574f4.tar.bz2
bcfg2-9dc02381c1f2c23a656d45390d12890318d574f4.zip
fixed misc. unit tests
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/AWSTags.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/AWSTags.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/AWSTags.py b/src/lib/Bcfg2/Server/Plugins/AWSTags.py
index 4b81a1275..166eb1066 100644
--- a/src/lib/Bcfg2/Server/Plugins/AWSTags.py
+++ b/src/lib/Bcfg2/Server/Plugins/AWSTags.py
@@ -106,7 +106,6 @@ class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked):
class AWSTags(Bcfg2.Server.Plugin.Plugin,
- Bcfg2.Server.Plugin.Caching,
Bcfg2.Server.Plugin.ClientRunHooks,
Bcfg2.Server.Plugin.Connector):
""" Query tags from AWS via boto, optionally setting group membership """
@@ -114,7 +113,6 @@ class AWSTags(Bcfg2.Server.Plugin.Plugin,
def __init__(self, core, datastore):
Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
- Bcfg2.Server.Plugin.Caching.__init__(self)
Bcfg2.Server.Plugin.ClientRunHooks.__init__(self)
Bcfg2.Server.Plugin.Connector.__init__(self)
try:
@@ -177,6 +175,8 @@ class AWSTags(Bcfg2.Server.Plugin.Plugin,
return self._tagcache[metadata.hostname]
def expire_cache(self, key=None):
+ """ Expire the cache for one host, or for all hosts. This is
+ exposed as an XML-RPC RMI. """
self._tagcache.expire(key=key)
def start_client_run(self, metadata):