From 21db03759a7e8c99d80da6037c61a5a86b2cb0bf Mon Sep 17 00:00:00 2001
From: gmarcospythian <marcos@pythian.com>
Date: Wed, 22 Jan 2025 12:29:19 -0700
Subject: [PATCH 1/2] Modifying conditions for additional packages reuirements
 on RHEL7 Marketplace, RHEL7 and OEL7

---
 roles/ora-host/tasks/main.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/roles/ora-host/tasks/main.yml b/roles/ora-host/tasks/main.yml
index fd65bec1..c56ba8c2 100644
--- a/roles/ora-host/tasks/main.yml
+++ b/roles/ora-host/tasks/main.yml
@@ -62,6 +62,17 @@
     path: /etc/yum.repos.d/rh-cloud.repo
   register: rh_cloud_repo
 
+- name: Install Oracle required packages (base/non-rhui config) for Marketplace RHEL7
+  yum:
+    name: "{{ oracle_required_rpms }}"
+    state: present
+    lock_timeout: 180
+    enablerepo: rhui-rhel-7-server-rhui-optional-rpms
+  when:
+    - install_os_packages|bool and ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7'
+    - redhat_repo.stat.exists|bool and rh_cloud_repo.stat.exists|bool
+  tags: os-packages
+
 - name: Install Oracle required packages (base/non-rhui config) for RHEL7
   yum:
     name: "{{ oracle_required_rpms }}"
@@ -69,8 +80,9 @@
     lock_timeout: 180
     enablerepo: rhel-7-server-optional-rpms
   when:
+    - rh_cloud_repo is not defined
     - install_os_packages|bool and ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7'
-    - redhat_repo.stat.exists|bool or rh_cloud_repo.stat.exists|bool
+    - redhat_repo.stat.exists|bool
   tags: os-packages
 
 - name: Stat OL7 repo
@@ -80,6 +92,17 @@
   when:
     - install_os_packages|bool and ansible_distribution == 'OracleLinux'
 
+- name: Install Oracle required packages (base/non-rhui config) for OEL7
+  yum:
+    name: "{{ oracle_required_rpms }}"
+    state: present
+    lock_timeout: 180
+    enablerepo: ol7_optional_latest
+  when:
+    - install_os_packages|bool and ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '7'
+    - oraclelinux_repo.stat.exists|bool
+  tags: os-packages
+
 - name: Stat OL8 repo
   stat:
     path: /etc/yum.repos.d/oracle-linux-ol8.repo

From 39102f9524c4e540224048eee550d9f8f6880967 Mon Sep 17 00:00:00 2001
From: Gabriel Marcos <marcos@pythian.com>
Date: Fri, 24 Jan 2025 16:03:06 -0700
Subject: [PATCH 2/2] Modifying conditions for additional packages requirements
 on RHEL7 Marketplace, RHEL7 and OEL7 dev/oratk-26 (#18)

* Small formatting udpates

* Revert "Small formatting udpates"

This reverts commit 20c1983d049df0930190c87f380f9af7cbfe19af.

* Add Gabriel's changes to dev/ branch

* Revert "Add Gabriel's changes to dev/ branch"

This reverts commit 9888dfe745017424b4c0218190d8940d9d3a0615.

* Modifying conditions for additional packages reuirements on RHEL7 Marketplace, RHEL7 and OEL7 (#16)

* Small formatting changes, only to blocks updated by Gabriel

---------

Co-authored-by: Simon Pane <pane@pythian.com>
---
 roles/ora-host/tasks/main.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/roles/ora-host/tasks/main.yml b/roles/ora-host/tasks/main.yml
index c56ba8c2..444c3b85 100644
--- a/roles/ora-host/tasks/main.yml
+++ b/roles/ora-host/tasks/main.yml
@@ -69,8 +69,11 @@
     lock_timeout: 180
     enablerepo: rhui-rhel-7-server-rhui-optional-rpms
   when:
-    - install_os_packages|bool and ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7'
-    - redhat_repo.stat.exists|bool and rh_cloud_repo.stat.exists|bool
+    - install_os_packages | bool
+    - ansible_distribution == 'RedHat'
+    - ansible_distribution_major_version == '7'
+    - redhat_repo.stat.exists | bool
+    - rh_cloud_repo.stat.exists | bool
   tags: os-packages
 
 - name: Install Oracle required packages (base/non-rhui config) for RHEL7
@@ -81,8 +84,10 @@
     enablerepo: rhel-7-server-optional-rpms
   when:
     - rh_cloud_repo is not defined
-    - install_os_packages|bool and ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7'
-    - redhat_repo.stat.exists|bool
+    - install_os_packages | bool
+    - ansible_distribution == 'RedHat'
+    - ansible_distribution_major_version == '7'
+    - redhat_repo.stat.exists | bool
   tags: os-packages
 
 - name: Stat OL7 repo
@@ -99,8 +104,10 @@
     lock_timeout: 180
     enablerepo: ol7_optional_latest
   when:
-    - install_os_packages|bool and ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '7'
-    - oraclelinux_repo.stat.exists|bool
+    - install_os_packages | bool
+    - ansible_distribution == 'OracleLinux'
+    - ansible_distribution_major_version == '7'
+    - oraclelinux_repo.stat.exists | bool
   tags: os-packages
 
 - name: Stat OL8 repo