From 03298e645d934aa307ab24cd8103e8edadcc6ebc Mon Sep 17 00:00:00 2001
From: gord chung <gord@live.ca>
Date: Wed, 2 Nov 2016 16:39:40 +0000
Subject: [PATCH] stop assuming ceph/swift share same endpoint

showing backtrace on a handled and warning logged exception seems
aggressive, just return as error.

also, stop setting ceph/swift to same endpoint

Change-Id: I33be2d433c86cd67add5fac92fed1b66219d48b6
Closes-Bug: #1573241
---
 ceilometer/agent/manager.py                   | 4 ++--
 ceilometer/objectstore/rgw.py                 | 3 +--
 ceilometer/tests/unit/objectstore/test_rgw.py | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ceilometer/agent/manager.py b/ceilometer/agent/manager.py
index a584e04540..b77fa4dd1c 100644
--- a/ceilometer/agent/manager.py
+++ b/ceilometer/agent/manager.py
@@ -32,7 +32,7 @@ from stevedore import extension
 
 from ceilometer.agent import plugin_base
 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 messaging
 from ceilometer import pipeline
@@ -207,7 +207,7 @@ class PollingTask(object):
                             'res_list': err.fail_res_list}))
                     self.resources[key].blacklist.extend(err.fail_res_list)
                 except Exception as err:
-                    LOG.warning(_(
+                    LOG.error(_LE(
                         'Continue after error from %(name)s: %(error)s')
                         % ({'name': pollster.name, 'error': err}),
                         exc_info=True)
diff --git a/ceilometer/objectstore/rgw.py b/ceilometer/objectstore/rgw.py
index d372b67418..24632a6c0a 100644
--- a/ceilometer/objectstore/rgw.py
+++ b/ceilometer/objectstore/rgw.py
@@ -28,7 +28,6 @@ LOG = log.getLogger(__name__)
 
 SERVICE_OPTS = [
     cfg.StrOpt('radosgw',
-               default='object-store',
                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
         # only ever called once, also we assume that in a single deployment
         # 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:
                 creds = conf.service_credentials
                 rgw_url = keystone_client.get_service_catalog(
diff --git a/ceilometer/tests/unit/objectstore/test_rgw.py b/ceilometer/tests/unit/objectstore/test_rgw.py
index 31a0fff99d..27ad1c8084 100644
--- a/ceilometer/tests/unit/objectstore/test_rgw.py
+++ b/ceilometer/tests/unit/objectstore/test_rgw.py
@@ -89,6 +89,8 @@ class TestRgwPollster(testscenarios.testcase.WithScenarios,
     def setUp(self):
         super(TestRgwPollster, self).setUp()
         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.manager = TestManager(0, self.CONF)