openstack/aodh
Code Issues Proposed changes

Merge "Disable rgw pollster when aws module not found"

Browse Source
This commit is contained in:
Jenkins 2015-06-03 04:00:47 +00:00 committed by Gerrit Code Review
commit 6e32bf7876
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometer/objectstore/rgw.py
View File

@ -23,7 +23,6 @@ import six.moves.urllib.parse as urlparse
from ceilometer.agent import plugin_base
from ceilometer.i18n import _
from ceilometer.objectstore.rgw_client import RGWAdminClient as rgwclient
from ceilometer import sample
LOG = log.getLogger(__name__)
@ -91,7 +90,12 @@ class _Base(plugin_base.PollsterBase):
if not endpoint:
raise StopIteration()
rgw_client = rgwclient(endpoint, self.access_key, self.secret)
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)
for t in tenants:
api_method = 'get_%s' % self.METHOD
yield t.id, getattr(rgw_client, api_method)(t.id)