Merge pull request #249 from Rendanic/patch5

OL8: Bugfix for RPM-Repos + asmlib

Author: oravirt

roles/orahost/defaults/main.yml

@@ -48,18 +48,44 @@
   keyfile: /tmp/known_hosts
 
   # Extra repositories that should be enabled
-  extrarepos_enabled:
+  extrarepos_enabled: "{%- if ansible_distribution == 'OracleLinux' -%}
+                          ol{{ ansible_distribution_major_version }}_addons
+                       {%- else -%}
+                       {%- endif %}"
   extrarepos_disabled:
 
-  #epel_rpm: "http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"
-  asmlib_rpm: "{% if ansible_distribution_major_version|int==6%}{{asmlib_rpm_el6}}{%elif ansible_distribution_major_version|int==7 %}{{asmlib_rpm_el7}}{% else %}None{% endif %}"
-  asmlibsupport_rpm: "{% if ansible_os_family == 'RedHat' %}{% if ansible_distribution_major_version|int==6%}{{asmlibsupport_rpm_el6}}{%elif ansible_distribution_major_version|int==7 %}{{asmlibsupport_rpm_el7}}{% else %}oracleasm-support{% endif %}{% else %}oracleasm-support{% endif %}"
+  # Install oracleasm-support from RPM-Repo on OracleLinux
+  asmlib_rpm:  "{%- if ansible_distribution_major_version|int == 6 %}
+                  {{ asmlib_rpm_el6 }}
+                {%- elif ansible_distribution_major_version|int ==7 %}
+                  {{ asmlib_rpm_el7 }}
+                {%- elif ansible_distribution_major_version|int ==8 %}
+                  {{ asmlib_rpm_el8 }}
+                {%- else %}
+                  None
+                {%- endif %}"
+
+  asmlibsupport_rpm: "{%- if ansible_distribution == 'OracleLinux' -%}
+                        oracleasm-support
+                      {%- else -%}
+                        {%- if ansible_distribution_major_version|int == 6 -%}
+                          {{asmlibsupport_rpm_el6}}
+                        {%- elif ansible_distribution_major_version|int == 7 -%}
+                          {{asmlibsupport_rpm_el7}}
+                        {%- elif ansible_distribution_major_version|int == 8 -%}
+                          {{asmlibsupport_rpm_el8}}
+                        {%- else -%}
+                          oracleasm-support
+                        {%- endif -%}
+                      {%- endif -%}"
+
   asmlib_rpm_el6: "http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.4-1.el6.x86_64.rpm"
   asmlib_rpm_el7: "http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.12-1.el7.x86_64.rpm"
+  asmlib_rpm_el8: "https://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.17-1.el8.x86_64.rpm"
   asmlib_rpm_sles: "http://oss.oracle.com/projects/oracleasm-support/dist/files/RPMS/sles12/amd64/2.1.8/oracleasm-support-2.1.8-1.SLE12.x86_64.rpm"
   asmlibsupport_rpm_el6: "http://oss.oracle.com/projects/oracleasm-support/dist/files/RPMS/rhel6/amd64/2.1.8/oracleasm-support-2.1.8-1.el6.x86_64.rpm"
   asmlibsupport_rpm_el7: "https://yum.oracle.com/repo/OracleLinux/OL7/latest/x86_64/getPackage/oracleasm-support-2.1.11-2.el7.x86_64.rpm"
-  # asmlibsupport_rpm_el7:  "http://yum.oracle.com/repo/OracleLinux/OL7/latest/x86_64/getPackage/oracleasm-support-2.1.8-3.el7.x86_64.rpm"
+  asmlibsupport_rpm_el8: "https://yum.oracle.com/repo/OracleLinux/OL8/latest/x86_64/getPackage/oracleasm-support-2.1.11-2.el8.x86_64.rpm"
 
   #ol6_repo_file: public-yum-ol6.repo
   repo_dir: /etc/yum.repos.d/

roles/orahost/tasks/main.yml

@@ -33,7 +33,11 @@
        state: installed
        enablerepo: "{{ extrarepos_enabled |default (omit, True) }}"
        disablerepo: "{{ extrarepos_disabled |default (omit, True) }}"
-    when: install_os_packages and device_persistence == 'asmlib' and ansible_os_family == 'RedHat' and asm_diskgroups is defined
+    when:
+      - install_os_packages | bool
+      - ansible_os_family == 'RedHat'
+      - device_persistence == 'asmlib'
+      - asm_diskgroups is defined
     tags: os_packages, oscheck
 
   - name: Install packages required by Oracle for ASMlib on SLES