From d088ddf4b4b1f8fab15c7d9a6b490995263c523d Mon Sep 17 00:00:00 2001 From: James Denton Date: Thu, 11 Mar 2021 15:31:11 -0600 Subject: [PATCH] Remove third-party OVS NSH support in favor of built-in support This patchset removes the ovs_nsh_support variable used to deploy a custom-compiled release of Open vSwitch with NSH support in favor of relying on built-in NSH support in recent releases of Open vSwitch[1]. [1] https://mail.openvswitch.org/pipermail/ovs-dev/2017-November/340716.html Change-Id: If6456d2916982226bbdc5080ec58a47b6fb1ec8d --- defaults/main.yml | 6 ------ ...evert-third-party-ovs-support-04602870ad8ccd2e.yaml | 10 ++++++++++ tasks/dependent_neutron_roles.yml | 8 -------- vars/debian.yml | 5 ----- vars/distro_install.yml | 4 +--- vars/source_install.yml | 4 +--- 6 files changed, 12 insertions(+), 25 deletions(-) create mode 100644 releasenotes/notes/revert-third-party-ovs-support-04602870ad8ccd2e.yaml diff --git a/defaults/main.yml b/defaults/main.yml index d460116c..9c880fb7 100644 --- a/defaults/main.yml +++ b/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 ### diff --git a/releasenotes/notes/revert-third-party-ovs-support-04602870ad8ccd2e.yaml b/releasenotes/notes/revert-third-party-ovs-support-04602870ad8ccd2e.yaml new file mode 100644 index 00000000..baa5aa32 --- /dev/null +++ b/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. + diff --git a/tasks/dependent_neutron_roles.yml b/tasks/dependent_neutron_roles.yml index c007040d..3967ecbc 100644 --- a/tasks/dependent_neutron_roles.yml +++ b/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 diff --git a/vars/debian.yml b/vars/debian.yml index e7e3d522..ea177cd7 100644 --- a/vars/debian.yml +++ b/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 diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 8ebcb42e..2f577306 100644 --- a/vars/distro_install.yml +++ b/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') %} - {% set _ = packages.extend(neutron_ovs_nsh_required_packages) %} - {% elif (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %} + {% if (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %} {% set _ = packages.extend(neutron_ovs_dpdk_required_packages) %} {% else %} {% set _ = packages.extend(neutron_ovs_distro_packages) %} diff --git a/vars/source_install.yml b/vars/source_install.yml index 8c420d33..de77e5cf 100644 --- a/vars/source_install.yml +++ b/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') %} - {% set _ = packages.extend(neutron_ovs_nsh_required_packages) %} - {% elif (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %} + {% if (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %} {% set _ = packages.extend(neutron_ovs_dpdk_required_packages) %} {% else %} {% set _ = packages.extend(neutron_ovs_distro_packages) %}