Merge pull request #646 from sujeetkjha/patch-5

Patch 5
IBM · May 17, 2022 · fec68e5 · fec68e5
2 parents 30afd5b + 65683e2
commit fec68e5
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 4 deletions.
diff --git a/roles/scale_fileauditlogging/node/tasks/install_local_pkg.yml b/roles/scale_fileauditlogging/node/tasks/install_local_pkg.yml
@@ -106,6 +106,18 @@
   set_fact:
     scale_fal_url: 'gpfs_debs/ubuntu/'
   when: ansible_distribution in scale_ubuntu_distribution
+
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_debs/ubuntu/ubuntu20/'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    - scale_version >= "5.1.4.0"
+
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/'
+  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
 #todo wrong
 - name: install | file audit logging path
   set_fact:

diff --git a/roles/scale_fileauditlogging/node/tasks/install_remote_pkg.yml b/roles/scale_fileauditlogging/node/tasks/install_remote_pkg.yml
@@ -94,6 +94,18 @@
   set_fact:
     scale_fal_url: 'gpfs_debs/ubuntu/'
   when: ansible_distribution in scale_ubuntu_distribution
+
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_debs/ubuntu/ubuntu20/'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    - scale_version >= "5.1.4.0"
+
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/'
+  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
 
 - name: install | file audit logging path
   set_fact:

diff --git a/roles/scale_fileauditlogging/node/tasks/install_repository.yml b/roles/scale_fileauditlogging/node/tasks/install_repository.yml
@@ -17,11 +17,18 @@
   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:
+    scale_fal_url: 'gpfs_debs/ubuntu/'
+  when: ansible_distribution in scale_ubuntu_distribution 
 
 - name: install | file audit logging path
   set_fact:
     scale_fal_url: 'gpfs_debs/ubuntu/ubuntu20/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    - scale_version >= "5.1.4.0"
 
 - name: install | file audit logging path
   set_fact:

diff --git a/roles/scale_fileauditlogging/upgrade/tasks/install_local_pkg.yml b/roles/scale_fileauditlogging/upgrade/tasks/install_local_pkg.yml
@@ -101,11 +101,18 @@
   set_fact:
     scale_fal_url: 'gpfs_rpms/rhel/'
   when: ansible_distribution in scale_rhel_distribution
+
+- 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_debs/ubuntu/ubuntu20/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    - scale_version >= "5.1.4.0"
 
 - name: upgrade | file audit logging path
   set_fact:

diff --git a/roles/scale_fileauditlogging/upgrade/tasks/install_remote_pkg.yml b/roles/scale_fileauditlogging/upgrade/tasks/install_remote_pkg.yml
@@ -89,11 +89,18 @@
   set_fact:
     scale_fal_url: 'gpfs_rpms/rhel/'
   when: ansible_distribution in scale_rhel_distribution
+
+- 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_debs/ubuntu/ubuntu20/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    - scale_version >= "5.1.4.0"
 
 - name: upgrade | file audit logging path
   set_fact:

diff --git a/roles/scale_fileauditlogging/upgrade/tasks/install_repository.yml b/roles/scale_fileauditlogging/upgrade/tasks/install_repository.yml
@@ -25,10 +25,17 @@
     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_debs/ubuntu/ubuntu20/'
-  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    - scale_version >= "5.1.4.0"
 
 - name: upgrade | file audit logging path
   set_fact: