Skip to content

Commit 9131bdf

Browse files
rajan-misrajan-mis
committed
UBUNTU 22.04 support into 5.1.2_PTF
Signed-off-by: Rajan Mishra [email protected]
1 parent ef4b725 commit 9131bdf

File tree

9 files changed

+172
-6
lines changed

9 files changed

+172
-6
lines changed

‎roles/nfs/node/tasks/install_local_pkg.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
- name: install | zimon path
156156
set_fact:
157157
scale_zimon_url: 'zimon_debs/ubuntu/'
158-
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
158+
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20'
159159

160160
- name: install | smb path
161161
set_fact:
@@ -172,6 +172,30 @@
172172
scale_smb_url: 'smb_debs/ubuntu/'
173173
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
174174

175+
- block:
176+
- name: install | smb path
177+
set_fact:
178+
scale_smb_url: 'smb_debs/ubuntu/ubuntu20/'
179+
when: ansible_distribution_major_version == '20'
180+
181+
- name: install | smb path
182+
set_fact:
183+
scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
184+
when: ansible_distribution_major_version == '22'
185+
186+
- name: install | nfs path
187+
set_fact:
188+
scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu20/'
189+
when: ansible_distribution_major_version == '20'
190+
191+
- name: install | nfs path
192+
set_fact:
193+
scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/'
194+
when: ansible_distribution_major_version == '22'
195+
when:
196+
- ansible_distribution in scale_ubuntu_distribution
197+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
198+
175199
# Find nfs rpms
176200
- block: ## when: host is defined as a protocol node
177201

‎roles/nfs/node/tasks/install_remote_pkg.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
- name: install | zimon path
130130
set_fact:
131131
scale_zimon_url: 'zimon_debs/ubuntu/'
132-
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
132+
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20'
133133

134134
- name: install | smb path
135135
set_fact:
@@ -146,6 +146,30 @@
146146
scale_smb_url: 'smb_debs/ubuntu/'
147147
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
148148

149+
- block:
150+
- name: install | smb path
151+
set_fact:
152+
scale_smb_url: 'smb_debs/ubuntu/ubuntu20/'
153+
when: ansible_distribution_major_version == '20'
154+
155+
- name: install | smb path
156+
set_fact:
157+
scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
158+
when: ansible_distribution_major_version == '22'
159+
160+
- name: install | nfs path
161+
set_fact:
162+
scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu20/'
163+
when: ansible_distribution_major_version == '20'
164+
165+
- name: install | nfs path
166+
set_fact:
167+
scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/'
168+
when: ansible_distribution_major_version == '22'
169+
when:
170+
- ansible_distribution in scale_ubuntu_distribution
171+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
172+
149173
- block: ## when: host is defined as a protocol node
150174

151175
- name: install | Find gpfs.smb (gpfs.smb) package

‎roles/nfs/node/tasks/install_repository.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,30 @@
4444
scale_smb_url: 'smb_debs/ubuntu/'
4545
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
4646

47+
- block:
48+
- name: install | smb path
49+
set_fact:
50+
scale_smb_url: 'smb_debs/ubuntu/ubuntu20/'
51+
when: ansible_distribution_major_version == '20'
52+
53+
- name: install | smb path
54+
set_fact:
55+
scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
56+
when: ansible_distribution_major_version == '22'
57+
58+
- name: install | nfs path
59+
set_fact:
60+
scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu20/'
61+
when: ansible_distribution_major_version == '20'
62+
63+
- name: install | nfs path
64+
set_fact:
65+
scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/'
66+
when: ansible_distribution_major_version == '22'
67+
when:
68+
- ansible_distribution in scale_ubuntu_distribution
69+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
70+
4771
- name: install | zimon path
4872
set_fact:
4973
scale_zimon_url: 'zimon_rpms/rhel7/'
@@ -72,7 +96,7 @@
7296
- name: install | zimon path
7397
set_fact:
7498
scale_zimon_url: 'zimon_debs/ubuntu/'
75-
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
99+
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20'
76100

77101
- name: install|configure nfs YUM repository
78102
yum_repository:

‎roles/smb/node/tasks/install_local_pkg.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,20 @@
133133
scale_smb_url: 'smb_debs/ubuntu/'
134134
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
135135

136+
- block:
137+
- name: install | smb path
138+
set_fact:
139+
scale_smb_url: 'smb_debs/ubuntu/ubuntu20/'
140+
when: ansible_distribution_major_version == '20'
141+
142+
- name: install | smb path
143+
set_fact:
144+
scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
145+
when: ansible_distribution_major_version == '22'
146+
when:
147+
- ansible_distribution in scale_ubuntu_distribution
148+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
149+
136150
# Find smb rpms
137151
- block: ## when: ansible_distribution in scale_rhel_distribution or ansible_distribution in scale_sles_distribution
138152

‎roles/smb/node/tasks/install_remote_pkg.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,20 @@
106106
scale_smb_url: 'smb_debs/ubuntu/'
107107
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
108108

109+
- block:
110+
- name: install | smb path
111+
set_fact:
112+
scale_smb_url: 'smb_debs/ubuntu/ubuntu20/'
113+
when: ansible_distribution_major_version == '20'
114+
115+
- name: install | smb path
116+
set_fact:
117+
scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
118+
when: ansible_distribution_major_version == '22'
119+
when:
120+
- ansible_distribution in scale_ubuntu_distribution
121+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
122+
109123
# Find smb rpms
110124
- block: ## when: ansible_distribution in scale_rhel_distribution or ansible_distribution in scale_sles_distribution
111125

‎roles/smb/node/tasks/install_repository.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,21 @@
3232
- name: install | smb path
3333
set_fact:
3434
scale_smb_url: 'smb_debs/ubuntu/'
35-
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20'
35+
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
36+
37+
- block:
38+
- name: install | smb path
39+
set_fact:
40+
scale_smb_url: 'smb_debs/ubuntu/ubuntu20/'
41+
when: ansible_distribution_major_version == '20'
42+
43+
- name: install | smb path
44+
set_fact:
45+
scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
46+
when: ansible_distribution_major_version == '22'
47+
when:
48+
- ansible_distribution in scale_ubuntu_distribution
49+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
3650

3751
- name: install | Configure smb YUM repository
3852
yum_repository:

‎roles/zimon/node/tasks/install_local_pkg.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,19 @@
136136
scale_zimon_url: 'zimon_debs/ubuntu/'
137137
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
138138

139+
- name: install | zimon path
140+
set_fact:
141+
scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
142+
when:
143+
- ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
144+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
145+
146+
- name: install | zimon path
147+
set_fact:
148+
scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
149+
when:
150+
- ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
151+
139152
- name: install | zimon path
140153
set_fact:
141154
scale_zimon_url: 'zimon_rpms/sles12/'

‎roles/zimon/node/tasks/install_remote_pkg.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,19 @@
110110
scale_zimon_url: 'zimon_debs/ubuntu/'
111111
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
112112

113+
- name: install | zimon path
114+
set_fact:
115+
scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
116+
when:
117+
- ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
118+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
119+
120+
- name: install | zimon path
121+
set_fact:
122+
scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
123+
when:
124+
- ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
125+
113126
- name: install | zimon path
114127
set_fact:
115128
scale_zimon_url: 'zimon_rpms/sles12/'

‎roles/zimon/node/tasks/install_repository.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- name: Initialize
88
set_fact:
99
scale_zimon_url: ""
10+
scale_zimon_collector_url: ""
1011

1112
- name: install | zimon path
1213
set_fact:
@@ -33,6 +34,19 @@
3334
scale_zimon_url: 'zimon_debs/ubuntu/'
3435
when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
3536

37+
- name: install | zimon path
38+
set_fact:
39+
scale_zimon_url: 'zimon_debs/ubuntu/ubuntu20/'
40+
when:
41+
- ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20'
42+
- scale_version >= "5.1.2.5" and scale_version <= "5.1.3.0"
43+
44+
- name: install | zimon path
45+
set_fact:
46+
scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/'
47+
when:
48+
- ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
49+
3650
- name: install | zimon path
3751
set_fact:
3852
scale_zimon_url: 'zimon_rpms/sles12/'
@@ -43,6 +57,16 @@
4357
scale_zimon_url: 'zimon_rpms/sles15/'
4458
when: ansible_distribution in scale_sles_distribution and ansible_distribution_major_version == '15'
4559

60+
- name: install | remove existing zimon APT repository
61+
file:
62+
path: "{{ item }}"
63+
state: absent
64+
with_items:
65+
- /etc/apt/sources.list.d/spectrum-scale-pm-ganesha-debs.list
66+
when:
67+
- ansible_distribution in scale_ubuntu_distribution
68+
- scale_version >= "5.1.4.0"
69+
4670
- name: install | Configure ZIMon YUM repository
4771
yum_repository:
4872
name: spectrum-scale-zimon
@@ -59,8 +83,8 @@
5983

6084
- name: install | Configure zimon APT repository
6185
apt_repository:
62-
filename: spectrum-scale-zimon-debs
63-
repo: "deb [trusted=yes] {{ scale_install_repository_url }}{{ scale_zimon_url }} ./"
86+
filename: "{{ item.key }}"
87+
repo: "deb [trusted=yes] {{ scale_install_repository_url }}{{ item.value }} ./"
6488
validate_certs: no
6589
state: present
6690
update_cache: yes
@@ -69,6 +93,8 @@
6993
when:
7094
- ansible_pkg_mgr == 'apt'
7195
- scale_install_repository_url != 'existing'
96+
with_dict:
97+
spectrum-scale-zimon-debs: "{{ scale_zimon_url }}"
7298

7399
- name: install | Configure ZIMon repository
74100
zypper_repository:

0 commit comments

Comments
 (0)