diff options
| author | ZhiQiang Fan <aji.zqfan@gmail.com> | 2016-05-22 08:56:56 +0800 |
|---|---|---|
| committer | ZhiQiang Fan <aji.zqfan@gmail.com> | 2016-05-22 08:56:56 +0800 |
| commit | 1610935ee3c00105df0e3038d249301e4627c381 (patch) | |
| tree | eb956102a19a8b4a3a0ebca2b7a59ce76f943757 /ceilometer/objectstore | |
| parent | af3bebed90cc2f88568aa49a1c86c98bc0fb9d23 (diff) | |
| download | ceilometer-1610935ee3c00105df0e3038d249301e4627c381.tar.gz | |
enable swift pollsters poll data for specific region
Currently swift pollsters only poll data from first region, which
is bad for multiple regions scenario.
This patch enables poll swift data for specific region. And improves
log message and promotes the log level to INFO, now it looks like:
Swift endpoint not found: public endpoint for object-store
service in RegionTwo region not found
Change-Id: Ifffb33ba1174a1a54f0ce1c4614bcd35d57ea4c3
Closes-Bug: #1584364
Diffstat (limited to 'ceilometer/objectstore')
| -rw-r--r-- | ceilometer/objectstore/swift.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index c6433392..ebd4806b 100644 --- a/ceilometer/objectstore/swift.py +++ b/ceilometer/objectstore/swift.py @@ -25,6 +25,7 @@ import six.moves.urllib.parse as urlparse from swiftclient import client as swift from ceilometer.agent import plugin_base +from ceilometer.i18n import _LI from ceilometer import keystone_client from ceilometer import sample @@ -72,9 +73,10 @@ class _Base(plugin_base.PollsterBase): _Base._ENDPOINT = keystone_client.get_service_catalog( ksclient).url_for( service_type=cfg.CONF.service_types.swift, - interface=conf.interface) - except exceptions.EndpointNotFound: - LOG.debug("Swift endpoint not found") + interface=conf.interface, + region_name=conf.region_name) + except exceptions.EndpointNotFound as e: + LOG.info(_LI("Swift endpoint not found: %s"), e) return _Base._ENDPOINT def _iter_accounts(self, ksclient, cache, tenants): |