From 3ff15a8ee7113b06c0393815a2327f99ec3e540b Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Sat, 27 Jun 2020 17:00:15 +0200 Subject: [PATCH] Add support for the Neutron service plugin "trunk" Change-Id: Ia22f286e85be90983ca79291b3a54596bba30d6c --- ansible/group_vars/all.yml | 1 + ansible/roles/neutron/defaults/main.yml | 2 ++ .../reference/networking/neutron-extensions.rst | 13 +++++++++++++ etc/kolla/globals.yml | 1 + ...meter-enable_neutron_trunk-1bca43f6c5c36aea.yaml | 5 +++++ 5 files changed, 22 insertions(+) create mode 100644 releasenotes/notes/add-parameter-enable_neutron_trunk-1bca43f6c5c36aea.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 940cae3a75..a66f552b8b 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -632,6 +632,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" diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 70c2268e38..3e6113f254 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -409,6 +409,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" diff --git a/doc/source/reference/networking/neutron-extensions.rst b/doc/source/reference/networking/neutron-extensions.rst index 1279752b1a..33b9262811 100644 --- a/doc/source/reference/networking/neutron-extensions.rst +++ b/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 ` and the `OpenStack wiki `_. + +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" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index b616b62339..203f113780 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -323,6 +323,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" diff --git a/releasenotes/notes/add-parameter-enable_neutron_trunk-1bca43f6c5c36aea.yaml b/releasenotes/notes/add-parameter-enable_neutron_trunk-1bca43f6c5c36aea.yaml new file mode 100644 index 0000000000..d3e0909168 --- /dev/null +++ b/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``.