openstack/ceilometer
Code Issues Proposed changes

Merge "stop assuming ceph/swift share same endpoint"

Browse Source
This commit is contained in:
Jenkins
2017-01-04 16:49:59 +00:00
committed by Gerrit Code Review
parent aa3f491bb7 03298e645d
commit 27df3d3d07
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/agent/manager.py
View File

@@ -32,7 +32,7 @@ from stevedore import extension
from ceilometer.agent import plugin_base from ceilometer.agent import plugin_base
from ceilometer import coordination from ceilometer import coordination
from ceilometer.i18n import _, _LE, _LI, _LW from ceilometer.i18n import _LE, _LI, _LW
from ceilometer import keystone_client from ceilometer import keystone_client
from ceilometer import messaging from ceilometer import messaging
from ceilometer import pipeline from ceilometer import pipeline
@@ -207,7 +207,7 @@ class PollingTask(object):
'res_list': err.fail_res_list})) 'res_list': err.fail_res_list}))
self.resources[key].blacklist.extend(err.fail_res_list) self.resources[key].blacklist.extend(err.fail_res_list)
except Exception as err: except Exception as err:
LOG.warning(_( LOG.error(_LE(
'Continue after error from %(name)s: %(error)s') 'Continue after error from %(name)s: %(error)s')
% ({'name': pollster.name, 'error': err}), % ({'name': pollster.name, 'error': err}),
exc_info=True) exc_info=True)

3
ceilometer/objectstore/rgw.py
View File

@@ -28,7 +28,6 @@ LOG = log.getLogger(__name__)
SERVICE_OPTS = [ SERVICE_OPTS = [
cfg.StrOpt('radosgw', cfg.StrOpt('radosgw',
default='object-store',
help='Radosgw service type.'), help='Radosgw service type.'),
] ]
@@ -64,7 +63,7 @@ class _Base(plugin_base.PollsterBase):
# we store the endpoint as a base class attribute, so keystone is # we store the endpoint as a base class attribute, so keystone is
# only ever called once, also we assume that in a single deployment # only ever called once, also we assume that in a single deployment
# we may be only deploying `radosgw` or `swift` as the object-store # we may be only deploying `radosgw` or `swift` as the object-store
if _Base._ENDPOINT is None: if _Base._ENDPOINT is None and conf.service_types.radosgw:
try: try:
creds = conf.service_credentials creds = conf.service_credentials
rgw_url = keystone_client.get_service_catalog( rgw_url = keystone_client.get_service_catalog(

2
ceilometer/tests/unit/objectstore/test_rgw.py
View File

@@ -89,6 +89,8 @@ class TestRgwPollster(testscenarios.testcase.WithScenarios,
def setUp(self): def setUp(self):
super(TestRgwPollster, self).setUp() super(TestRgwPollster, self).setUp()
self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF = self.useFixture(fixture_config.Config()).conf
self.CONF.set_override('radosgw', 'object-store',
group='service_types')
self.pollster = self.factory(self.CONF) self.pollster = self.factory(self.CONF)
self.manager = TestManager(0, self.CONF) self.manager = TestManager(0, self.CONF)