From a8d0586fdebfd28e407e2d30f72c92e3711d0a1e Mon Sep 17 00:00:00 2001 From: Ilya Shakhat Date: Mon, 14 Sep 2015 15:43:05 +0300 Subject: [PATCH] Do not specify host for l2population topics When creating topics oslo.messaging automatically creates topic with hostname suffix (e.g. topic.hostname), there's no need to do this explicitly. Change-Id: Ia396452e8deb2c8f10bbead936245eeece8066a6 Closes-Bug: #1495508 --- .../ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py | 3 +-- .../plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py index 175a81c83..0a42ccb23 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -921,8 +921,7 @@ class LinuxBridgeNeutronAgentRPC(service.Service): [topics.NETWORK, topics.DELETE], [topics.SECURITY_GROUP, topics.UPDATE]] if cfg.CONF.VXLAN.l2_population: - consumers.append([topics.L2POPULATION, - topics.UPDATE, cfg.CONF.host]) + consumers.append([topics.L2POPULATION, topics.UPDATE]) self.connection = agent_rpc.create_consumers(self.endpoints, self.topic, consumers) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py index 56e67c1f4..76f0b1dbf 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py @@ -377,8 +377,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, [topics.DVR, topics.UPDATE], [topics.NETWORK, topics.UPDATE]] if self.l2_pop: - consumers.append([topics.L2POPULATION, - topics.UPDATE, self.conf.host]) + consumers.append([topics.L2POPULATION, topics.UPDATE]) self.connection = agent_rpc.create_consumers(self.endpoints, self.topic, consumers, -- 2.45.2