From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Wed, 21 Jan 2015 12:56:19 +0000 (+0300)
Subject: Do not duplicate message consumers
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6da3d014bfa95c979db1d6ce18ba10d629b80481;p=openstack-build%2Fneutron-build.git

Do not duplicate message consumers

Oslo.messaging creates node topic (with node name as suffix)
and fanout topic automatically. There's no need to do this
in Neutron code.

Closes bug 1413156

Change-Id: Ic790cab648b213b55679038967fef12eb5cec606
---

diff --git a/neutron/common/rpc.py b/neutron/common/rpc.py
index 5a345f5ae..aeb4cb4d3 100644
--- a/neutron/common/rpc.py
+++ b/neutron/common/rpc.py
@@ -158,13 +158,7 @@ class Service(service.Service):
 
         endpoints = [self.manager]
 
-        # Share this same connection for these Consumers
-        self.conn.create_consumer(self.topic, endpoints, fanout=False)
-
-        node_topic = '%s.%s' % (self.topic, self.host)
-        self.conn.create_consumer(node_topic, endpoints, fanout=False)
-
-        self.conn.create_consumer(self.topic, endpoints, fanout=True)
+        self.conn.create_consumer(self.topic, endpoints)
 
         # Hook to allow the manager to do other initializations after
         # the rpc connection is created.