From a3f957591c3cb6d44d8ed5629af644d5885be963 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Tue, 9 May 2017 10:55:54 +0200
Subject: [PATCH] Only use br-tun on network and compute nodes

Neutron-server does not use br-tun at all,
this is only needed at compute and network nodes.

Change-Id: I0e11baa3fc8ee15c951cf4fc9aaa3a1d47819e81
Closes-Bug: #1642521
---
 ansible/roles/neutron/templates/ml2_conf.ini.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2
index ba7647deec..51d6e665e1 100644
--- a/ansible/roles/neutron/templates/ml2_conf.ini.j2
+++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2
@@ -89,4 +89,7 @@ physical_interface_mappings = physnet1:{{ neutron_external_interface }}
 l2_population = true
 {% endif %}
 {% endif %}
+
+{% if inventory_hostname in groups["network"] or inventory_hostname in groups["compute"] %}
 local_ip = {{ tunnel_interface_address }}
+{% endif %}