From 0a5e0de6b0b4c01935334ddb0212d3dc0f555203 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 16 Aug 2023 11:57:20 +0000 Subject: [PATCH] Revert "Workaround ovs bug that resets hostname with add command" This reverts commit 74b0884fc232aa96f601b4c24c3e36f3fba4f1bb. Reason for revert: UCA and OVS SIG have updated package and marked corresponding bugs as resolved. Change-Id: Idbb9f4ee84a075bfa6e7e63c8d5b81951ce0ae65 --- tasks/providers/ovn_config.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/tasks/providers/ovn_config.yml b/tasks/providers/ovn_config.yml index 6f3d5c32..539e386e 100644 --- a/tasks/providers/ovn_config.yml +++ b/tasks/providers/ovn_config.yml @@ -23,34 +23,6 @@ - neutron_services['neutron-ovn-controller']['group'] in group_names - neutron_ovn_ssl -# NOTE(noonedeapdunk): ovs 3.1 installed by rdo now has a bug, where -# `ovs-vsctl add` acts exactly as `set` and resets hostname -# so we fully disable functionality of managing hostnames -# Ubuntu in it's place don't run this vulnerable version and -# passes --no-record-hostname in systemd unit file already -- name: Disable seetting ovs hostname for RHEL - lineinfile: - path: /etc/sysconfig/openvswitch - line: OPTIONS="--no-record-hostname" - search_string: 'OPTIONS=' - when: - - ansible_facts['pkg_mgr'] == 'dnf' - - neutron_services['neutron-ovn-controller']['group'] in group_names - -# NOTE(noonedeadpunk): ovs 3.1.0 installed from UCA for Antelope now has a bug where -# `ovs-vsctl add` acts exactly as `set` and resets hostname -# so we mask service that executes that part to prevent failures -# https://bugs.launchpad.net/cloud-archive/+bug/2017757 -- name: Mask setting OVS hostname service - service: - name: ovs-record-hostname - enabled: false - state: stopped - when: - - ansible_facts['pkg_mgr'] == 'apt' - - ansible_facts['distribution_version'] == '22.04' - - neutron_services['neutron-ovn-controller']['group'] in group_names - - name: Ensure ovn-northd service is started and enabled systemd: name: "{{ neutron_ovn_northd_service_name }}"