From 803aaa65977e1e52836eb7a8428a992aa095d2ed Mon Sep 17 00:00:00 2001
From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Tue, 1 Nov 2016 07:34:02 -0400
Subject: [PATCH] Uses tunnel_interface as ovs tunnel instead of api_interface
Closes-Bug: #1638242
Change-Id: Ib5192d1379457cd4292fc71dcbd62f78a02a1c07
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---
ansible/group_vars/all.yml | 2 +-
ansible/roles/neutron/templates/ml2_conf.ini.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 24772f765c..07a009447f 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -108,7 +108,7 @@ storage_interface: "{{ network_interface }}"
cluster_interface: "{{ network_interface }}"
tunnel_interface: "{{ network_interface }}"
bifrost_network_interface: "{{ network_interface }}"
-
+tunnel_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + tunnel_interface]['ipv4']['address'] }}"
# Valid options are [ openvswitch, linuxbridge, sfc ]
neutron_plugin_agent: "openvswitch"
diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2
index f304d023ea..b689440e0d 100644
--- a/ansible/roles/neutron/templates/ml2_conf.ini.j2
+++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2
@@ -69,4 +69,4 @@ physical_interface_mappings = physnet1:{{ neutron_external_interface }}
[vxlan]
l2_population = true
{% endif %}
-local_ip = {{ api_interface_address }}
+local_ip = {{ tunnel_interface_address }}