Merge pull request #12467 from barbacbd/OCPBUGS-18703

OCPBUGS-18703: Correct upgrade for conflict packages.
openshift · Sep 27, 2023 · 8ea9a41 · 8ea9a41
2 parents ef4d6eb + 6154dfb
commit 8ea9a41
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 57 deletions.
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
@@ -86,9 +86,6 @@ openshift_node_support_packages_by_os_major_version:
     - openvswitch3.1
     - policycoreutils-python-utils
 
-openshift_conflict_packages:
-  - openvswitch
-
 openshift_node_support_packages_by_arch:
   ppc64le:
     - irqbalance

diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml
@@ -89,9 +89,11 @@
 
 - block:
   - name: Install openshift packages
-    package:
+    dnf:
       name: "{{ openshift_packages }}"
       state: latest
+      allowerasing: true
+      disable_gpg_check: true
     async: 3600
     poll: 30
     register: result

diff --git a/roles/openshift_node/tasks/package_conflicts.yml b/roles/openshift_node/tasks/package_conflicts.yml
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
@@ -25,9 +25,6 @@
   - include_tasks: "{{ openshift_node_pre_upgrade_hook }}"
   when: openshift_node_pre_upgrade_hook is defined
 
-# Manually upgrade challenging packages that may have conflicts during normal upgrade
-- import_tasks: package_conflicts.yml
-
 # Upgrade Node Packages
 - import_tasks: install.yml