summaryrefslogtreecommitdiff
path: root/ceilometer/objectstore
diff options
context:
space:
mode:
authorRohit Jaiswal <rohit.jaiswal@hp.com>2015-08-06 01:45:54 +0000
committerRohit Jaiswal <rohit.jaiswal@hp.com>2015-08-06 16:39:24 +0000
commit833385f84640fdf2f38f90e1976188d6d2448d96 (patch)
tree0148baf47b5554f88bff1e245700bb2665282bb6 /ceilometer/objectstore
parentece5275fce2668f00741331b4a35de7484b9ec99 (diff)
downloadceilometer-833385f84640fdf2f38f90e1976188d6d2448d96.tar.gz
Fix for rgw still throwing errors
When raising the PollsterPermanentError, the list of resources(tenants) are passed, which enables the Agent Manager to blacklist those resources. This stops those resources from being polled again and avoids any unwanted error messages from being logged. Change-Id: I4f7bf23d5d7f3c182e4089d80b03a1587fa31222 Closes-Bug: #1475441
Diffstat (limited to 'ceilometer/objectstore')
-rw-r--r--ceilometer/objectstore/rgw.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/objectstore/rgw.py b/ceilometer/objectstore/rgw.py
index 66e8d0c2..9ca6e8ee 100644
--- a/ceilometer/objectstore/rgw.py
+++ b/ceilometer/objectstore/rgw.py
@@ -93,8 +93,8 @@ class _Base(plugin_base.PollsterBase):
try:
from ceilometer.objectstore.rgw_client import RGWAdminClient
rgw_client = RGWAdminClient(endpoint, self.access_key, self.secret)
- except ImportError as e:
- raise plugin_base.PollsterPermanentError(e)
+ except ImportError:
+ raise plugin_base.PollsterPermanentError(tenants)
for t in tenants:
api_method = 'get_%s' % self.METHOD