openstack/kolla-ansible
Code Issues Proposed changes

HyperV should not disable tunneling

Browse Source 
HyperV support disables tunneling for entire environment. This
should not be the case since tunneling can be used for KVM in mix
env. In this case, HyperV VMs can only use flat/vlan networks.

Change-Id: I6237c42918442625acd946b7455d236612ba19cc
Closes-Bug: #1725417
This commit is contained in:
Dan Ardelean 2017-10-27 12:29:55 +03:00
parent a7248ab18b
commit bac90b87bd
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/neutron/templates/ml2_conf.ini.j2
View File

@ -44,11 +44,9 @@ flat_networks = *
flat_networks = {% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}{% if not loop.last %},{% endif %}{% endfor %} flat_networks = {% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}{% if not loop.last %},{% endif %}{% endfor %}
{% endif %} {% endif %}
{% if not enable_hyperv | bool %}
[ml2_type_vxlan] [ml2_type_vxlan]
vni_ranges = 1:1000 vni_ranges = 1:1000
vxlan_group = 239.1.1.1 vxlan_group = 239.1.1.1
{% endif %}
[securitygroup] [securitygroup]
{% if neutron_plugin_agent == "openvswitch" or neutron_plugin_agent == "opendaylight" %} {% if neutron_plugin_agent == "openvswitch" or neutron_plugin_agent == "opendaylight" %}
@ -58,12 +56,10 @@ firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
{% endif %} {% endif %}
{% if neutron_plugin_agent == "openvswitch" or neutron_plugin_agent == "opendaylight" %} {% if neutron_plugin_agent == "openvswitch" or neutron_plugin_agent == "opendaylight" %}
{% if not enable_hyperv | bool %}
[agent] [agent]
tunnel_types = vxlan tunnel_types = vxlan
l2_population = true l2_population = true
arp_responder = true arp_responder = true
{% endif %}
{% if enable_neutron_dvr | bool %} {% if enable_neutron_dvr | bool %}
enable_distributed_routing = True enable_distributed_routing = True
@ -86,11 +82,9 @@ integration_bridge = br-int-{{ item }}
[linux_bridge] [linux_bridge]
physical_interface_mappings = physnet1:{{ neutron_external_interface }} physical_interface_mappings = physnet1:{{ neutron_external_interface }}
{% if not enable_hyperv | bool %}
[vxlan] [vxlan]
l2_population = true l2_population = true
{% endif %} {% endif %}
{% endif %}
{% if inventory_hostname in groups["network"] or inventory_hostname in groups["compute"] %} {% if inventory_hostname in groups["network"] or inventory_hostname in groups["compute"] %}
local_ip = {{ tunnel_interface_address }} local_ip = {{ tunnel_interface_address }}