openstack/kolla-ansible
Code Issues Proposed changes

XenAPI: fix two neutron configures

Browse Source 
This commit contains two fixes:
1. ``of_listen_address``: We use the xenapi's facts directly, so
that we can avoid depending on facts gathered by setup for hosts;
This is useful when deploy on the role of neutron only (--tag neutron);
2. ``local_ip``: Get the proper IP for tunnel. It should be chosen
from dom0's IP which is in the same network where tunnel interface
is connected.

blueprint: xenserver-support

Change-Id: I61bbd6499323e3fddd6293a0df6baec34dbddf23
This commit is contained in:
Jianghua Wang 2018-01-25 11:10:04 +00:00
parent 71a6611a84
commit c8245edf91
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/neutron/templates/ml2_conf_xenapi.ini.j2
View File

@ -10,7 +10,7 @@ root_helper_daemon = xenapi_root_helper
root_helper =
[ovs]
of_listen_address = {{ hostvars[inventory_hostname]['ansible_' + os_xenapi_variables.domu_himn_eth]["ipv4"]["address"] }}
of_listen_address = {{ os_xenapi_variables.domu_himn_ip }}
ovsdb_connection = tcp:{{ xenserver_himn_ip }}:{{ ovsdb_port }}
{% if computes_need_external_bridge %}
bridge_mappings = {% for interface in neutron_external_interface.split(',') %}physnet{{ loop.index0 + 1 }}:{{ os_xenapi_variables.domu_vifs[interface]["bridge"] }}{% if not loop.last %},{% endif %}{% endfor %}
@ -18,6 +18,8 @@ bridge_mappings = {% for interface in neutron_external_interface.split(',') %}ph
bridge_mappings =
{% endif %}
local_ip = {% for ip in os_xenapi_variables.dom0_ipv4s %}{% if ip.bridge == os_xenapi_variables.domu_vifs[tunnel_interface]['bridge'] %}{{ip.address}}{% endif %} {% endfor %}
[xenapi]
connection_password = {{ xenserver_password }}
connection_username = {{ xenserver_username }}