openstack/kolla-ansible
Code Issues Proposed changes

Merge "Uses tunnel_interface as ovs tunnel instead of api_interface"

Browse Source
This commit is contained in:
Jenkins 2016-11-10 19:46:01 +00:00 committed by Gerrit Code Review
commit 3ec8e33a17
2 changed files with 2 additions and 2 deletions
ansible
group_vars
all.yml
roles/neutron/templates
ml2_conf.ini.j2

2
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"

2
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 }}