Merge "Remove third-party OVS NSH support in favor of built-in support"

defaults/main.yml

@@ -446,12 +446,6 @@ neutron_ovn_l3_scheduler: leastloaded
 neutron_ovn_ip: "{{ internal_lb_vip_address }}"
 neutron_ovsdb_manager: ptcp:6640:127.0.0.1
 
-# Install Openvswitch without NSH support
-ovs_nsh_support: False
-
-# Set higher priority to mardim PPA when ovs_nsh_support is True
-ovs_nsh_apt_pinned_packages: [{ package: "*", release: "LP-PPA-mardim-mardim-ppa"}]
-
 ###
 ### DPDK Configuration
 ###

releasenotes/notes/revert-third-party-ovs-support-04602870ad8ccd2e.yaml

@@ -0,0 +1,10 @@
+---
+deprecations:
+  - |
+    Support for an Open vSwitch dataplate with NSH support using the
+    ``ovs_nsh_support`` variable has been immediately deprecated and
+    removed due to built-in support for NSH in recent Open vSwitch
+    releases. The prior PPA provided a custom release of OVS 2.9, which
+    is no longer appropriate for recent releases of OSA and respective
+    operating systems.
+

tasks/dependent_neutron_roles.yml

@@ -13,14 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Include apt_package_pinning role
-  include_role:
-    name: apt_package_pinning
-  vars:
-    apt_pinned_packages: "{{ ovs_nsh_support | ternary(ovs_nsh_apt_pinned_packages, omit) }}"
-  when:
-    - ansible_pkg_mgr == 'apt'
-
 - name: Include etcd role
   include_role:
     name: etcd

vars/debian.yml

@@ -25,11 +25,6 @@ neutron_ovn_controller_service_name: ovn-host
 
 neutron_ovs_socket_path: "/var/run/openvswitch"
 
-neutron_ovs_nsh_required_packages:
-  - openvswitch-common
-  - openvswitch-switch
-  - python-openvswitch
-
 neutron_ovs_dpdk_required_packages:
   - openvswitch-common
   - openvswitch-switch-dpdk

vars/distro_install.yml

@@ -26,9 +26,7 @@ neutron_package_list: |-
   {% set packages = neutron_distro_packages %}
   {% if neutron_needs_openvswitch | bool %}
   {% set _ = packages.extend(neutron_optional_ovs_distro_packages) %}
-  {% if (ovs_nsh_support and ansible_pkg_mgr == 'apt') %}
+  {% if (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %}
-  {% set _ = packages.extend(neutron_ovs_nsh_required_packages) %}
-  {% elif (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %}
   {% set _ = packages.extend(neutron_ovs_dpdk_required_packages) %}
   {% else %}
   {% set _ = packages.extend(neutron_ovs_distro_packages) %}

vars/source_install.yml

@@ -25,9 +25,7 @@
 neutron_package_list: |-
   {% set packages = neutron_distro_packages %}
   {% if neutron_needs_openvswitch | bool %}
-  {% if (ovs_nsh_support and ansible_pkg_mgr == 'apt') %}
+  {% if (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %}
-  {% set _ = packages.extend(neutron_ovs_nsh_required_packages) %}
-  {% elif (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %}
   {% set _ = packages.extend(neutron_ovs_dpdk_required_packages) %}
   {% else %}
   {% set _ = packages.extend(neutron_ovs_distro_packages) %}