summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-04 15:33:16 +0000
committerGerrit Code Review <review@openstack.org>2015-02-04 15:33:16 +0000
commit5e233750a87135302916643e6a81d3ef50a86c29 (patch)
tree9a8165507c3b411631160f5dd9d2f1b5768db7bb
parenta409b1a10446555eb090f07459a391fc03958673 (diff)
parent464dbd3b23e1dac92f84919d4d0a2e3a7ee6db9d (diff)
downloadceilometermiddleware-5e233750a87135302916643e6a81d3ef50a86c29.tar.gz
Merge "add options to configure messaging"
-rw-r--r--ceilometermiddleware/swift.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/ceilometermiddleware/swift.py b/ceilometermiddleware/swift.py
index 5877364..7431b9b 100644
--- a/ceilometermiddleware/swift.py
+++ b/ceilometermiddleware/swift.py
@@ -22,11 +22,19 @@ In /etc/swift/proxy-server.conf on the main pipeline add "ceilometer" just
before "proxy-server" and add the following filter in the file:
.. code-block:: python
[filter:ceilometer]
- paste.filter_factory = ceilometermiddleware.swift:R
+ paste.filter_factory = ceilometermiddleware.swift:filter_factory
# Some optional configuration this allow to publish additional metadata
metadata_headers = X-TEST
# Set reseller prefix (defaults to "AUTH_" if not set)
reseller_prefix = AUTH_
+ # Set control_exchange to publish to.
+ control_exchange = swift
+ # Set transport url
+ transport_url = rabbit://me:passwd@host:5672/virtual_host
+ # set messaging driver
+ driver = messaging
+ # set topic
+ topic = notifications
"""
import functools
import logging
@@ -92,9 +100,13 @@ class Swift(object):
def __init__(self, app, conf):
self._app = app
+ oslo.messaging.set_transport_defaults(conf.get('control_exchange',
+ 'swift'))
self._notifier = oslo.messaging.Notifier(
- oslo.messaging.get_transport(cfg.CONF),
- publisher_id='ceilometermiddleware')
+ oslo.messaging.get_transport(cfg.CONF, url=conf.get('url')),
+ publisher_id='ceilometermiddleware',
+ driver=conf.get('driver', 'messaging'),
+ topic=conf.get('topic', 'notifications'))
self.metadata_headers = [h.strip().replace('-', '_').lower()
for h in conf.get(