diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-10 19:46:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-10 19:46:01 +0000 |
| commit | 3ec8e33a17670626c430c275144a5dd71d41722c (patch) | |
| tree | 654d78fabb2fc5bb85bb00b3a32b70010cc01246 | |
| parent | 0a86367eb7bd8bd4329fee5802f96c3b8dfef5b7 (diff) | |
| parent | 803aaa65977e1e52836eb7a8428a992aa095d2ed (diff) | |
| download | kolla-3ec8e33a17670626c430c275144a5dd71d41722c.tar.gz kolla-3ec8e33a17670626c430c275144a5dd71d41722c.zip | |
Merge "Uses tunnel_interface as ovs tunnel instead of api_interface"
| -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 }} |