diff options
| author | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2016-11-01 07:34:02 -0400 |
|---|---|---|
| committer | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2016-11-06 22:06:42 -0500 |
| commit | 803aaa65977e1e52836eb7a8428a992aa095d2ed (patch) | |
| tree | fc3182f0c551b11e42a9153e7410760dcfd7e689 | |
| parent | b7bac2fba0f6ff16630b03017dbc971b3b8deb67 (diff) | |
| download | kolla-803aaa65977e1e52836eb7a8428a992aa095d2ed.tar.gz kolla-803aaa65977e1e52836eb7a8428a992aa095d2ed.zip | |
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>
| -rw-r--r-- | ansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | 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 24772f765..07a009447 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 f304d023e..b689440e0 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 }} |