diff options
| author | Doug Hellmann <doug@doughellmann.com> | 2015-04-28 16:05:49 +0000 |
|---|---|---|
| committer | Doug Hellmann <doug@doughellmann.com> | 2015-04-28 16:22:05 +0000 |
| commit | e41b259a1e635fcaf8d873c18602f2cbafd36020 (patch) | |
| tree | cc80899f5ee3f44b01666811848cea077522e4f9 /ceilometer/publisher | |
| parent | 1b593e9b009fe38e470aa8a6aa0eaa02adcaa3aa (diff) | |
| download | ceilometer-e41b259a1e635fcaf8d873c18602f2cbafd36020.tar.gz | |
Drop use of 'oslo' namespace package.
The Oslo libraries have moved all of their code out of the 'oslo'
namespace package into per-library packages. The namespace package was
retained during kilo for backwards compatibility, but will be removed by
the liberty-2 milestone. This change removes the use of the namespace
package, replacing it with the new package names.
The patches in the libraries will be put on hold until application
patches have landed, or L2, whichever comes first. At that point, new
versions of the libraries without namespace packages will be released as
a major version update.
Please merge this patch, or an equivalent, before L2 to avoid problems
with those library releases.
Blueprint: remove-namespace-packages
https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages
Change-Id: I2eeef93ee2e61a721c69f62add819f93f62f077d
Diffstat (limited to 'ceilometer/publisher')
| -rw-r--r-- | ceilometer/publisher/messaging.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ceilometer/publisher/messaging.py b/ceilometer/publisher/messaging.py index 4ef03566..cabbae01 100644 --- a/ceilometer/publisher/messaging.py +++ b/ceilometer/publisher/messaging.py @@ -19,8 +19,8 @@ import abc import itertools import operator -import oslo.messaging from oslo_config import cfg +import oslo_messaging import six import six.moves.urllib.parse as urlparse @@ -148,7 +148,7 @@ class MessagingPublisher(publisher.PublisherBase): context, topic, data = queue[0] try: self._send(context, topic, data) - except oslo.messaging.MessageDeliveryFailure: + except oslo_messaging.MessageDeliveryFailure: data = sum([len(m) for __, __, m in queue]) if policy == 'queue': LOG.warn(_("Failed to publish %d datapoints, queue them"), @@ -204,7 +204,7 @@ class NotifierPublisher(MessagingPublisher): super(NotifierPublisher, self).__init__(parsed_url) options = urlparse.parse_qs(parsed_url.query) topic = options.get('topic', [default_topic])[-1] - self.notifier = oslo.messaging.Notifier( + self.notifier = oslo_messaging.Notifier( messaging.get_transport(), driver=cfg.CONF.publisher_notifier.telemetry_driver, publisher_id='telemetry.publisher.%s' % cfg.CONF.host, |