summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2015-05-06 20:42:55 +0000
committerDoug Hellmann <doug@doughellmann.com>2015-05-06 20:45:55 +0000
commit22681aa0693193158bf753803e45e0b3d78f0923 (patch)
treee459a8fa77a9bcd44b2d4c27f68887001895dde3
parent02c2bc69e5061edda7aa324ec515930a7d1d0b8d (diff)
downloadceilometermiddleware-22681aa0693193158bf753803e45e0b3d78f0923.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: I26390dd908769be5f1a5b70be22d3b98e3a45563
-rw-r--r--ceilometermiddleware/swift.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ceilometermiddleware/swift.py b/ceilometermiddleware/swift.py
index 9ffb3b7..8dfb6fb 100644
--- a/ceilometermiddleware/swift.py
+++ b/ceilometermiddleware/swift.py
@@ -39,9 +39,9 @@ before "proxy-server" and add the following filter in the file:
import functools
import logging
-import oslo.messaging
from oslo_config import cfg
from oslo_context import context
+import oslo_messaging
from oslo_utils import timeutils
from pycadf import event as cadf_event
from pycadf.helper import api
@@ -101,10 +101,10 @@ class Swift(object):
def __init__(self, app, conf):
self._app = app
- oslo.messaging.set_transport_defaults(conf.get('control_exchange',
+ oslo_messaging.set_transport_defaults(conf.get('control_exchange',
'swift'))
- self._notifier = oslo.messaging.Notifier(
- oslo.messaging.get_transport(cfg.CONF, url=conf.get('url')),
+ self._notifier = oslo_messaging.Notifier(
+ oslo_messaging.get_transport(cfg.CONF, url=conf.get('url')),
publisher_id='ceilometermiddleware',
driver=conf.get('driver', 'messaging'),
topic=conf.get('topic', 'notifications'))