Merge "Add support for the Neutron service plugin "trunk""

ansible/group_vars/all.yml

@@ -631,6 +631,7 @@ enable_neutron_bgp_dragent: "no"
 enable_neutron_provider_networks: "no"
 enable_neutron_segments: "no"
 enable_neutron_sfc: "no"
+enable_neutron_trunk: "no"
 enable_neutron_metering: "no"
 enable_neutron_infoblox_ipam_agent: "no"
 enable_neutron_port_forwarding: "no"

ansible/roles/neutron/defaults/main.yml

@@ -407,6 +407,8 @@ service_plugins:
     enabled: "{{ enable_neutron_segments | bool }}"
   - name: "sfc"
     enabled: "{{ enable_neutron_sfc | bool }}"
+  - name: "trunk"
+    enabled: "{{ enable_neutron_trunk | bool }}"
   - name: "vpnaas"
     enabled: "{{ enable_neutron_vpnaas | bool }}"
   - name: "port_forwarding"

doc/source/reference/networking/neutron-extensions.rst

@@ -78,3 +78,16 @@ encrypted ping packets observed being sent from one to the other.
 For more information on this and VPNaaS in Neutron refer to the
 :neutron-vpnaas-doc:`Neutron VPNaaS Testing <contributor/index.html#testing>`
 and the `OpenStack wiki <https://wiki.openstack.org/wiki/Neutron/VPNaaS>`_.
+
+Trunking
+--------
+
+The network trunk service allows multiple networks to be connected to an
+instance using a single virtual NIC (vNIC). Multiple networks can be presented
+to an instance by connecting it to a single port.
+
+Modify the ``/etc/kolla/globals.yml`` file as the following example shows:
+
+.. code-block:: yaml
+
+   enable_neutron_trunk: "yes"

etc/kolla/globals.yml

@@ -321,6 +321,7 @@
 #enable_neutron_provider_networks: "no"
 #enable_neutron_segments: "no"
 #enable_neutron_sfc: "no"
+#enable_neutron_trunk: "no"
 #enable_neutron_metering: "no"
 #enable_neutron_infoblox_ipam_agent: "no"
 #enable_neutron_port_forwarding: "no"

releasenotes/notes/add-parameter-enable_neutron_trunk-1bca43f6c5c36aea.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    With the boolean parameter ``enable_neutron_trunk`` it is now possible
+    to enable or disable the Neutron service plugin ``trunk``.