Merge pull request #522 from rajan-mis/fal_master

GPFS kafka package installation time improvement

Author: rajan-mis

roles/scale_fileauditlogging/node/tasks/install_repository.yml

@@ -10,8 +10,13 @@
 
 - name: install | file audit logging path
   set_fact:
-    scale_fal_url: 'gpfs_rpms/rhel/'
-  when: ansible_distribution in scale_rhel_distribution
+    scale_fal_url: 'gpfs_rpms/rhel7/'
+  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
+
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_rpms/rhel8/'
+  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
 
 - name: install | file audit logging path
   set_fact:
@@ -20,7 +25,7 @@
 
 - name: install | file audit logging path
   set_fact:
-    scale_fal_url: 'gpfs_rpms/rhel/'
+    scale_fal_url: 'gpfs_rpms/sles15/'
   when: ansible_distribution in scale_sles_distribution
 
 - name: install | Configure GPFS Java YUM repository

roles/scale_fileauditlogging/upgrade/tasks/install_repository.yml

@@ -7,21 +7,32 @@
 - name: upgrade | Initialize
   set_fact:
    scale_fal_url: ""
+   scale_kafaka_url: ""
    package_installed: false
 
 - name: upgrade | file audit logging path
   set_fact:
-    scale_fal_url: 'gpfs_rpms/rhel/'
+    scale_kafaka_url: 'gpfs_rpms/rhel/'
   when: ansible_distribution in scale_rhel_distribution
 
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_rpms/rhel7/'
+  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '7'
+
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_rpms/rhel8/'
+  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
+
 - name: upgrade | file audit logging path
   set_fact:
     scale_fal_url: 'gpfs_debs/ubuntu/'
   when: ansible_distribution in scale_ubuntu_distribution
 
 - name: upgrade | file audit logging path
   set_fact:
-    scale_fal_url: 'gpfs_rpms/rhel/'
+    scale_fal_url: 'gpfs_rpms/sles15/'
   when: ansible_distribution in scale_sles_distribution
 
 - name: upgrade | Check if gpfs kafka installed
@@ -76,6 +87,21 @@
     - ansible_pkg_mgr == 'zypper'
     - scale_install_repository_url != 'existing'
 
+- name: upgrade | Configure fal YUM repository
+  yum_repository:
+    name: spectrum-scale-kafkafal
+    description: IBM Spectrum Scale (KAFKAFAL)
+    baseurl: "{{ scale_install_repository_url }}{{ scale_kafaka_url }}"
+    gpgcheck: "{{ scale_install_gpgcheck }}"
+    repo_gpgcheck: no
+    sslverify: no
+    state: present
+  notify: yum-clean-metadata
+  when:
+    - ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf'
+    - scale_install_repository_url != 'existing'
+    - gpfskafka_installed.rc == 0
+
 - name: upgrade | Configure fal YUM repository
   yum_repository:
     name: spectrum-scale-fal

roles/scale_fileauditlogging/upgrade/tasks/yum/install.yml

@@ -2,17 +2,16 @@
 #
 # Install or update RPMs
 #
-- name: Initialize
-  set_fact:
-    disable_gpgcheck: "no"
-
-- name: Disable gpg check
-  set_fact:
-    disable_gpgcheck: "yes"
-  when: scale_version < '5.0.4.0'
+- name: upgrade | Upgrade GPFS file audit logging packages
+  yum:
+    name: "{{ scale_install_all_packages }}"
+    state: latest
+    disable_gpg_check: "{{ scale_disable_gpgcheck }}"
+  when: ansible_pkg_mgr == 'yum'
 
 - name: upgrade | Upgrade GPFS file audit logging packages
-  package:
+  dnf:
     name: "{{ scale_install_all_packages }}"
     state: latest
-    disable_gpg_check: "{{ disable_gpgcheck }}"
+    disable_gpg_check: "{{ scale_disable_gpgcheck }}"
+  when: ansible_pkg_mgr == 'dnf'