diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-29 10:00:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-29 10:00:40 +0000 |
| commit | c472709a571ead73fe28179e8ad145670fe34693 (patch) | |
| tree | 1440d5534e5e308cfe645e07ff674ecb4dbec800 /ceilometer | |
| parent | 7e545b0fd9fd4a393d9e2af30f9fc370b20078c0 (diff) | |
| parent | 26d569dee5d9943dd12c1b54f7a9256159f22225 (diff) | |
| download | ceilometer-c472709a571ead73fe28179e8ad145670fe34693.tar.gz | |
Merge "Remove unnecessary logic for missing oslo.cache"
Diffstat (limited to 'ceilometer')
| -rw-r--r-- | ceilometer/publisher/gnocchi.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py index 19d7d54b..27e499f5 100644 --- a/ceilometer/publisher/gnocchi.py +++ b/ceilometer/publisher/gnocchi.py @@ -24,6 +24,7 @@ import uuid from gnocchiclient import exceptions as gnocchi_exc from keystoneauth1 import exceptions as ka_exceptions +import oslo_cache from oslo_log import log from oslo_utils import timeutils from stevedore import extension @@ -214,7 +215,6 @@ class GnocchiPublisher(publisher.ConfigPublisherBase): self.cache = None try: - import oslo_cache oslo_cache.configure(conf) # NOTE(cdent): The default cache backend is a real but # noop backend. We don't want to use that here because @@ -225,8 +225,6 @@ class GnocchiPublisher(publisher.ConfigPublisherBase): self.cache = oslo_cache.configure_cache_region( conf, cache_region) self.cache.key_mangler = cache_key_mangler - except ImportError: - pass except oslo_cache.exception.ConfigurationError as exc: LOG.warning('unable to configure oslo_cache: %s', exc) |