summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-08-01 15:12:52 +0100
committerMark McLoughlin <markmc@redhat.com>2012-08-01 15:12:52 +0100
commit8557af7bc0a12b6981b18c71915434562cd1431f (patch)
tree555f8b0ad2e4661bcf49a9dcfc1ba154d957dc27 /openstack
parent7b5412ffc874c6ff89f61b286a69c88080b65f42 (diff)
downloadoslo-8557af7bc0a12b6981b18c71915434562cd1431f.tar.gz
oslo-8557af7bc0a12b6981b18c71915434562cd1431f.tar.xz
oslo-8557af7bc0a12b6981b18c71915434562cd1431f.zip
Remove bogus conf argument from create_consumer()
Fixes bug #1031713 Commit 0b11668 in nova added a conf parameter to the create_consumer() method in the base class, but not to the implementations. Looks to be a random thinko. Change-Id: I92b87eed2f7708af696e02e229bf6daa0d305fdd
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/common.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/openstack/common/rpc/common.py b/openstack/common/rpc/common.py
index 2e15c3e..d2a1cf1 100644
--- a/openstack/common/rpc/common.py
+++ b/openstack/common/rpc/common.py
@@ -108,7 +108,7 @@ class Connection(object):
"""
raise NotImplementedError()
- def create_consumer(self, conf, topic, proxy, fanout=False):
+ def create_consumer(self, topic, proxy, fanout=False):
"""Create a consumer on this connection.
A consumer is associated with a message queue on the backend message
@@ -117,7 +117,6 @@ class Connection(object):
off of the queue will determine which method gets called on the proxy
object.
- :param conf: An openstack.common.cfg configuration object.
:param topic: This is a name associated with what to consume from.
Multiple instances of a service may consume from the same
topic. For example, all instances of nova-compute consume
@@ -133,7 +132,7 @@ class Connection(object):
"""
raise NotImplementedError()
- def create_worker(self, conf, topic, proxy, pool_name):
+ def create_worker(self, topic, proxy, pool_name):
"""Create a worker on this connection.
A worker is like a regular consumer of messages directed to a
@@ -143,7 +142,6 @@ class Connection(object):
be asked to process it. Load is distributed across the members
of the pool in round-robin fashion.
- :param conf: An openstack.common.cfg configuration object.
:param topic: This is a name associated with what to consume from.
Multiple instances of a service may consume from the same
topic.