Merge pull request #648 from rajan-mis/512_PTF_support

Upgarde code of 5.1.2 PTF for UBUNTU 22

Author: rajan-mis

roles/nfs/upgrade/tasks/install_repository.yml

@@ -52,9 +52,23 @@
 - name: upgrade | zimon path
   set_fact:
    scale_zimon_url: 'zimon_debs/ubuntu/'
-  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'
+
+- block:
+   - name: upgrade | nfs path
+     set_fact:
+        scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu20/'
+     when: ansible_distribution_major_version == '20'
+
+   - name: upgrade | nfs path
+     set_fact:
+        scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/'
+     when: ansible_distribution_major_version == '22'
+  when:
+     - ansible_distribution in scale_ubuntu_distribution
+     - scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
 
-- name: install|configure nfs YUM repository
+- name: upgrade | configure nfs YUM repository
   yum_repository:
     name: spectrum-scale-nfs-rpms
     description: IBM Spectrum Scale (NFS RPMS)

roles/smb/upgrade/tasks/install_repository.yml

@@ -32,7 +32,21 @@
 - name: upgrade | smb path
   set_fact:
    scale_smb_url: 'smb_debs/ubuntu/'
-  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'
+
+- block:
+   - name: install | smb path
+     set_fact:
+        scale_smb_url: 'smb_debs/ubuntu/ubuntu20/'
+     when: ansible_distribution_major_version == '20'
+
+   - name: install | smb path
+     set_fact:
+        scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
+     when: ansible_distribution_major_version == '22'
+  when:
+     - ansible_distribution in scale_ubuntu_distribution
+     - scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
 
 - name: upgrade | Configure smb YUM repository
   yum_repository:

roles/zimon/upgrade/tasks/install_repository.yml

@@ -7,6 +7,7 @@
 - name: Initialize
   set_fact:
    scale_zimon_url: ""
+   scale_zimon_collector_url: ""
    is_scale_collector_pkg_installed: false
    is_scale_pmswift_pkg_installed: false
 
@@ -30,11 +31,29 @@
     scale_zimon_url: 'zimon_debs/ubuntu/ubuntu18/'
   when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '18'
 
+- name: upgrade | zimon path
+  set_fact:
+    scale_zimon_url: 'zimon_debs/ubuntu/'
+  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20'
+
 - name: upgrade | zimon path
   set_fact:
     scale_zimon_url: 'zimon_debs/ubuntu/'
   when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
 
+- name: upgrade | zimon path
+  set_fact:
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
+    - scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
+
+- name: upgrade | zimon path
+  set_fact:
+    scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
+  when:
+    - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
+
 - name: upgrade | zimon path
   set_fact:
     scale_zimon_url: 'zimon_rpms/sles12/'
@@ -45,6 +64,16 @@
     scale_zimon_url: 'zimon_rpms/sles15/'
   when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
 
+- name: upgrade | remove existing zimon APT repository
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - /etc/apt/sources.list.d/spectrum-scale-pm-ganesha-debs.list
+  when:
+    - ansible_distribution in scale_ubuntu_distribution
+    - scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
+
 - name: upgrade | Configure ZIMon YUM repository
   yum_repository:
     name: spectrum-scale-zimon
@@ -61,8 +90,8 @@
 
 - name: upgrade | Configure zimon APT repository
   apt_repository:
-    filename: spectrum-scale-zimon-debs
-    repo: "deb [trusted=yes] {{ scale_install_repository_url }}{{ scale_zimon_url }} ./"
+    filename: "{{ item.key }}" 
+    repo: "deb [trusted=yes] {{ scale_install_repository_url }}{{ item.value }} ./"
     validate_certs: no
     state: present
     update_cache: yes
@@ -71,6 +100,8 @@
   when:
     - ansible_pkg_mgr == 'apt'
     - scale_install_repository_url != 'existing'
+  with_dict:
+    spectrum-scale-zimon-debs: "{{ scale_zimon_url }}"
 
 - name: upgrade | Configure ZIMon repository
   zypper_repository: