Support configuring tunnel network

Support configuring a separate tunnel network for tenant
overlay network traffic.

Change-Id: I74274823d6fe3a42aabcca00c8cd20e1abb3d219
Story: 2003054
Task: 23091

ansible/group_vars/all/compute

@@ -18,7 +18,8 @@ compute_network_interfaces: >
 compute_default_network_interfaces: >
   {{ ([admin_oc_net_name,
        internal_net_name,
-       storage_net_name] +
+       storage_net_name,
+       tunnel_net_name] +
       (external_net_names if kolla_enable_neutron_provider_networks | bool else [])) | unique | list }}
 
 # List of extra networks to which compute nodes are attached.

ansible/group_vars/all/controllers

@@ -32,7 +32,8 @@ controller_extra_network_interfaces: []
 
 # List of network interfaces to which network nodes are attached.
 controller_network_host_network_interfaces: >
-  {{ ([public_net_name] +
+  {{ ([public_net_name,
+       tunnel_net_name] +
       external_net_names) | unique | list }}
 
 ###############################################################################

ansible/group_vars/all/network

@@ -40,6 +40,9 @@ public_net_name: >
      if external_net_names | length > 0 else
      None }}
 
+# Name of the network used by Neutron to carry tenant overlay network traffic.
+tunnel_net_name: "{{ internal_net_name }}"
+
 # Name of the network used to carry storage data traffic.
 storage_net_name: 'storage_net'
 

ansible/kolla-ansible.yml

@@ -65,6 +65,7 @@
             kolla_provision_interface: "{{ provision_wl_net_name | net_interface(controller_host) | replace('-', '_') }}"
             kolla_inspector_dnsmasq_interface: "{{ inspection_net_name | net_interface(controller_host) | replace('-', '_') }}"
             kolla_dns_interface: "{{ public_net_name | net_interface(controller_host) | replace('-', '_') }}"
+            kolla_tunnel_interface: "{{ tunnel_net_name | net_interface(controller_host) | replace('-', '_') }}"
 
         - name: Validate controller Kolla Ansible network configuration
           fail:

ansible/roles/kolla-ansible/defaults/main.yml

@@ -143,6 +143,7 @@ kolla_api_interface:
 kolla_storage_interface:
 kolla_cluster_interface:
 kolla_dns_interface:
+kolla_tunnel_interface:
 
 # This is the raw interface given to neutron as its external network port. Even
 # though an IP address can exist on this interface, it will be unusable in most

ansible/roles/kolla-ansible/templates/globals.yml.j2

@@ -102,7 +102,7 @@ kolla_external_vip_interface: "{{ kolla_external_vip_interface }}"
 storage_interface: "{{ kolla_storage_interface }}"
 cluster_interface: "{{ kolla_cluster_interface }}"
 dns_interface: "{{ kolla_dns_interface }}"
-# NOTE: tunnel_interface is unused.
+tunnel_interface: "{{ kolla_tunnel_interface }}"
 
 # This is the raw interface given to neutron as its external network port. Even
 # though an IP address can exist on this interface, it will be unusable in most

ansible/roles/kolla-ansible/tests/test-defaults.yml

@@ -44,6 +44,7 @@
             kolla_bifrost_network_interface: "eth8"
             kolla_provision_interface: "eth9"
             kolla_inspector_dnsmasq_interface: "eth10"
+            kolla_tunnel_interface: "eth11"
             kolla_enable_tls_external: False
             kolla_enable_grafana: False
             kolla_external_fqdn_cert: "fake-cert"
@@ -91,6 +92,7 @@
               neutron_bridge_name: "br0,br1"
               bifrost_network_interface: "eth8"
               ironic_dnsmasq_interface: "eth10"
+              tunnel_interface: "eth11"
               neutron_plugin_agent: "openvswitch"
               kolla_enable_tls_external: False
               kolla_external_fqdn_cert: "fake-cert"

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -49,6 +49,7 @@
             kolla_bifrost_network_interface: "eth8"
             kolla_provision_interface: "eth9"
             kolla_inspector_dnsmasq_interface: "eth10"
+            kolla_tunnel_interface: "eth11"
             kolla_neutron_ml2_type_drivers:
               - "fake-ml2-type-1"
               - "fake-ml2-type-2"
@@ -186,6 +187,7 @@
               neutron_bridge_name: "br0,br1"
               bifrost_network_interface: "eth8"
               ironic_dnsmasq_interface: "eth10"
+              tunnel_interface: "eth11"
               neutron_plugin_agent: "openvswitch"
               kolla_enable_tls_external: False
               kolla_external_fqdn_cert: "fake-cert"

dev/dev-vagrant.yml

@@ -27,6 +27,7 @@ oob_wl_net_name: aio
 provision_wl_net_name: aio
 internal_net_name: aio
 public_net_name: aio
+tunnel_net_name: aio
 external_net_name: aio
 storage_net_name: aio
 storage_mgmt_net_name: aio

doc/source/configuration/network.rst

@@ -420,6 +420,9 @@ Internal network (``internal_net_name``)
     Name of the network used to expose the internal OpenStack API endpoints.
 Public network (``public_net_name``)
     Name of the network used to expose the public OpenStack API endpoints.
+Tunnel network (``tunnel_net_name``)
+    Name of the network used by Neutron to carry tenant overlay network
+    traffic.
 External networks (``external_net_names``, deprecated: ``external_net_name``)
     List of names of networks used to provide external network access via
     Neutron. If ``external_net_name`` is defined, ``external_net_names``
@@ -450,6 +453,7 @@ To configure network roles in a system with two networks, ``example1`` and
    provision_wl_net_name: example2
    internal_net_name: example2
    public_net_name: example2
+   tunnel_net_name: example2
    external_net_name: example2
    storage_net_name: example2
    storage_mgmt_net_name: example2
@@ -661,6 +665,7 @@ attached to the following networks:
 
 * public network
 * external network
+* tunnel network
 
 This list may be extended by setting ``controller_extra_network_interfaces`` to a
 list of names of additional networks to attach.  Alternatively, the list may be
@@ -692,6 +697,7 @@ By default, virtualised compute hosts are attached to the following networks:
 * overcloud admin network
 * internal network
 * storage network
+* tunnel network
 
 This list may be extended by setting ``compute_extra_network_interfaces`` to a
 list of names of additional networks to attach.  Alternatively, the list may be

etc/kayobe/networks.yml

@@ -36,6 +36,9 @@
 # Name of the network used to expose the public OpenStack API endpoints.
 #public_net_name:
 
+# Name of the network used by Neutron to carry tenant overlay network traffic.
+#tunnel_net_name:
+
 # Name of the network used to carry storage data traffic.
 #storage_net_name:
 

releasenotes/notes/support_configuring_tunnel_network-1646eef887d72abf.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Support configuring tunnel network and interface for VM to VM
+    communication.