From bcf695913f5332c0acf08b206cc055c9482664d9 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Tue, 25 May 2021 17:30:23 +0200
Subject: [PATCH] Fix Oracle yum disabled repository file after EPEL install
 (#7639)

---
 roles/bootstrap-os/tasks/bootstrap-centos.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/roles/bootstrap-os/tasks/bootstrap-centos.yml b/roles/bootstrap-os/tasks/bootstrap-centos.yml
index 8ef433397..721c431a4 100644
--- a/roles/bootstrap-os/tasks/bootstrap-centos.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-centos.yml
@@ -41,6 +41,15 @@
     - '''ID="ol"'' in os_release.stdout_lines'
     - (ansible_distribution_version | float) < 7.6
 
+- name: Install EPEL for Oracle Linux repo package
+  package:
+    name: "oracle-epel-release-el{{ ansible_distribution_major_version }}"
+    state: present
+  when:
+    - use_oracle_public_repo|default(true)
+    - '''ID="ol"'' in os_release.stdout_lines'
+    - (ansible_distribution_version | float) >= 7.6
+
 - name: Enable Oracle Linux repo
   ini_file:
     dest: "/etc/yum.repos.d/oracle-linux-ol{{ ansible_distribution_major_version }}.repo"
@@ -48,6 +57,7 @@
     option: "{{ item.option }}"
     value: "{{ item.value }}"
   with_items:
+    - { option: "name", value: "ol{{ ansible_distribution_major_version }}_addons" }
     - { option: "enabled", value: "1" }
     - { option: "baseurl", value: "http://yum.oracle.com/repo/OracleLinux/OL{{ ansible_distribution_major_version }}/addons/x86_64/" }
   when:
@@ -55,15 +65,6 @@
     - '''ID="ol"'' in os_release.stdout_lines'
     - (ansible_distribution_version | float) >= 7.6
 
-- name: Install EPEL for Oracle Linux repo package
-  package:
-    name: "oracle-epel-release-el{{ ansible_distribution_major_version }}"
-    state: present
-  when:
-    - use_oracle_public_repo|default(true)
-    - '''ID="ol"'' in os_release.stdout_lines'
-    - (ansible_distribution_version | float) >= 7.6
-
 # CentOS ships with python installed
 
 - name: Check presence of fastestmirror.conf