Merge pull request #180 from pythian/rel/oratk-26

Modifying conditions for additional packages requirements on RHEL7 Marketplace, RHEL7 and OEL7

roles/ora-host/tasks/main.yml

@@ -62,15 +62,32 @@
     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
+    - 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
   yum:
     name: "{{ oracle_required_rpms }}"
     state: present
     lock_timeout: 180
     enablerepo: rhel-7-server-optional-rpms
   when:
-    - 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
+    - rh_cloud_repo is not defined
+    - install_os_packages | bool
+    - ansible_distribution == 'RedHat'
+    - ansible_distribution_major_version == '7'
+    - redhat_repo.stat.exists | bool
   tags: os-packages
 
 - name: Stat OL7 repo
@@ -80,6 +97,19 @@
   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
+    - ansible_distribution == 'OracleLinux'
+    - 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