Skip to content

Commit dadeb36

Browse files
author
Achim Christ
committed
Remove unsupported args: warn parameter from command / shell module
Signed-off-by: Achim Christ <[email protected]>
1 parent b5edb87 commit dadeb36

File tree

21 files changed

+66
-122
lines changed

21 files changed

+66
-122
lines changed

roles/callhome_install/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
---
22
- name: install | Disable repo metadata gpg check
33
command: "zypper modifyrepo --gpgcheck-allow-unsigned-repo --all"
4-
args:
5-
warn: false
64

75
- name: install | Install GPFS Callhome packages
86
zypper:
9-
name: "{{ scale_install_all_packages }}"
10-
state: present
11-
disable_gpg_check: no
7+
name: "{{ scale_install_all_packages }}"
8+
state: present
9+
disable_gpg_check: no
1210

1311
- name: install | Enable repo metadata gpg check
1412
command: "zypper modifyrepo --default-gpgcheck --all"
15-
args:
16-
warn: false
17-

roles/core_common/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
# handlers file for node
44
- name: yum-clean-metadata
55
command: yum clean metadata
6-
args:
7-
warn: false

roles/core_common/tasks/check.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
available in a relative path to the specified directory.
1818
1919
- name: check | Find available scale version
20-
shell: rpm -qp "{{ scale_install_directory_pkg_path }}/gpfs.base-*.{{ scale_architecture }}.rpm"
21-
--qf '%{VERSION}.%{RELEASE}\n' | cut -d '.' -f -4
22-
args:
23-
warn: false
20+
shell:
21+
rpm -qp "{{ scale_install_directory_pkg_path }}/gpfs.base-*.{{ scale_architecture }}.rpm"
22+
--qf '%{VERSION}.%{RELEASE}\n' | cut -d '.' -f -4
2423
register: scale_gpfsversion
2524
changed_when: false
2625

@@ -42,8 +41,6 @@
4241

4342
- name: check | Find available scale version
4443
shell: "echo {{ scale_package }} | cut -d '-' -f 2"
45-
args:
46-
warn: false
4744
register: scale_se_gpfsversion
4845
changed_when: false
4946

@@ -118,7 +115,7 @@
118115
- rpm_key:
119116
state: present
120117
key: "{{ scale_gpgKey_dest }}/{{ scale_gpg_key_name }}"
121-
when: ((ansible_distribution in scale_sles_distribution or ansible_distribution in scale_rhel_distribution)
118+
when:
119+
((ansible_distribution in scale_sles_distribution or ansible_distribution in scale_rhel_distribution)
122120
and scale_enable_gpg_check and scale_version >= "5.0.5.0"
123121
and scale_install_repository_url is defined)
124-

roles/core_install/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
# handlers file for node
44
- name: yum-clean-metadata
55
command: yum clean metadata
6-
args:
7-
warn: false

roles/core_install/tasks/install_license_repository.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313

1414
- name: Find license package
1515
shell:
16-
cmd: apt-cache show gpfs.license.*
16+
cmd: apt-cache show gpfs.license.*
1717
register: package_name
1818
when:
19-
- ansible_pkg_mgr == 'apt'
19+
- ansible_pkg_mgr == 'apt'
2020

2121
- name: install | Get license package
2222
shell:
23-
cmd: zypper info gpfs.license.* | grep Name | cut -d ':' -f 2 | tr -d '[:space:]'
24-
args:
25-
warn: false
23+
cmd: zypper info gpfs.license.* | grep Name | cut -d ':' -f 2 | tr -d '[:space:]'
2624
register: package_name_version_zypp
2725
when:
2826
- ansible_pkg_mgr == 'zypper'
@@ -46,15 +44,15 @@
4644

4745
- name: install | Find GPFS License package
4846
set_fact:
49-
scale_gpfs_license_package: "{{ package_name.stdout_lines.0[9:] }}"
47+
scale_gpfs_license_package: "{{ package_name.stdout_lines.0[9:] }}"
5048
when:
51-
- ansible_pkg_mgr == 'apt'
49+
- ansible_pkg_mgr == 'apt'
5250

5351
- name: install | Find GPFS License package
5452
set_fact:
55-
scale_gpfs_license_package: "{{ package_name_version_zypp.stdout }}"
53+
scale_gpfs_license_package: "{{ package_name_version_zypp.stdout }}"
5654
when:
57-
- ansible_pkg_mgr == 'zypper'
55+
- ansible_pkg_mgr == 'zypper'
5856

5957
- name: install | Add GPFS license packages to list
6058
set_fact:
@@ -63,12 +61,12 @@
6361
- "{{ scale_gpfs_license_package }}"
6462
- gpfs.adv
6563
- gpfs.crypto
66-
when:
64+
when:
6765
- '"gpfs.license.std" not in scale_gpfs_license_package'
6866
- '"gpfs.license.da" not in scale_gpfs_license_package'
6967

7068
- name: install | Add GPFS license packages to list
7169
set_fact:
7270
scale_install_license_packages: "{{ scale_gpfs_license_package }}"
73-
when: "'gpfs.license.std' in scale_gpfs_license_package or
74-
'gpfs.license.da' in scale_gpfs_license_package"
71+
when: "'gpfs.license.std' in scale_gpfs_license_package or
72+
'gpfs.license.da' in scale_gpfs_license_package"

roles/core_install/tasks/upgrade.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99

1010
- name: update | Find current gpfs version
1111
shell: rpm -q gpfs.base --queryformat '%{VERSION}-%{RELEASE}\n'
12-
args:
13-
warn: false
1412
register: scale_current_version_gpfs
1513
changed_when: false
1614
failed_when: false
1715

1816
- name: update | Find available version
1917
shell: rpm -qp "{{ scale_gpfs_path_url }}/gpfs.base-*.{{ scale_architecture }}.rpm" --qf '%{VERSION}-%{RELEASE}\n'
20-
args:
21-
warn: false
2218
register: scale_repo_gpfsversion
2319
when: scale_install_repository_url is undefined
2420
changed_when: false
@@ -29,7 +25,6 @@
2925
scale_repo_gpfsversion: "{{ scale_repo_gpfsversion.stdout }}"
3026
when: scale_install_repository_url is undefined
3127

32-
3328
- name: update | Get package version
3429
yum:
3530
list: gpfs.base
@@ -40,14 +35,13 @@
4035
package_name_version: "{{ package_name_version.results|selectattr('yumstate','match','available')|map(attribute='version')|list|first }}"
4136
package_name_release: "{{ package_name_version.results|selectattr('yumstate','match','available')|map(attribute='release')|list|first }}"
4237
when:
43-
- "'available' in package_name_version.results | map(attribute='yumstate') | list"
38+
- "'available' in package_name_version.results | map(attribute='yumstate') | list"
4439

4540
- name: update | Set gpfs package version
4641
set_fact:
4742
package_gpfs_version: "{{ package_name_version }}-{{ package_name_release }}"
4843
when: scale_install_repository_url is defined
4944

50-
5145
- name: update | Check if node needs to be updated
5246
set_fact:
5347
scale_install_needsupdate: "{{ scale_current_version_gpfs.stdout != package_gpfs_version }}"
@@ -56,11 +50,11 @@
5650

5751
- set_fact:
5852
scale_vars_update: "{{ ansible_play_hosts|
59-
map('extract', hostvars, 'scale_install_needsupdate')|
60-
list }}"
53+
map('extract', hostvars, 'scale_install_needsupdate')|
54+
list }}"
6155
run_once: true
6256

63-
- block: ## run_once: true
57+
- block: ## run_once: true
6458
- name: update | Check if any running node needs to be updated
6559
vars:
6660
msg: |-

roles/core_upgrade/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
# handlers file for node
44
- name: yum-clean-metadata
55
command: yum clean metadata
6-
args:
7-
warn: false

roles/core_upgrade/tasks/install_repository.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
- name: Initialize
88
set_fact:
9-
is_scale_java_pkg_installed: false
9+
is_scale_java_pkg_installed: false
1010

1111
- name: upgrade | Configure GPFS YUM repository
1212
yum_repository:
@@ -91,32 +91,28 @@
9191
register: is_gpfsjava_package_installed
9292
failed_when: no
9393
changed_when: no
94-
args:
95-
warn: false
9694
when: ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf' or ansible_pkg_mgr == 'zypper'
9795

9896
- name: upgrade | Set if gpfs java package is installed
9997
set_fact:
10098
is_scale_java_pkg_installed: true
10199
when:
102-
- ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf' or ansible_pkg_mgr == 'zypper'
103-
- is_gpfsjava_package_installed.rc == 0
100+
- ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf' or ansible_pkg_mgr == 'zypper'
101+
- is_gpfsjava_package_installed.rc == 0
104102

105103
- name: upgrade | Check if gpfs java package is installed
106104
shell: dpkg -l | grep gpfs.java | awk "{print $1}" | grep ii
107105
register: is_gpfsjava_apt_package_installed
108106
failed_when: no
109107
changed_when: no
110-
args:
111-
warn: false
112108
when: ansible_pkg_mgr == 'apt'
113109

114110
- name: upgrade | Set if gpfs java package installed
115111
set_fact:
116112
is_scale_java_pkg_installed: true
117113
when:
118-
- ansible_pkg_mgr == 'apt'
119-
- is_gpfsjava_apt_package_installed.rc == 0
114+
- ansible_pkg_mgr == 'apt'
115+
- is_gpfsjava_apt_package_installed.rc == 0
120116

121117
- name: upgrade | Add GPFS java packages to list
122118
set_fact:

roles/ece_install/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false

roles/ece_upgrade/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false

roles/fal_upgrade/tasks/yum/install.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
register: gpfslibrdkafka_installed
1010
ignore_errors: true
1111
failed_when: false
12-
args:
13-
warn: false
1412

1513
- name: upgrade | Set if gpfs librdkafka installed
1614
set_fact:
@@ -27,8 +25,8 @@
2725
state: latest
2826
disable_gpg_check: "{{ scale_disable_gpgcheck }}"
2927
when:
30-
- ansible_pkg_mgr == 'yum'
31-
- librdkafka_installed is not defined
28+
- ansible_pkg_mgr == 'yum'
29+
- librdkafka_installed is not defined
3230

3331
- name: upgrade | Upgrade GPFS file audit logging packages
3432
yum:
@@ -37,8 +35,8 @@
3735
update_only: yes
3836
disable_gpg_check: "{{ scale_disable_gpgcheck }}"
3937
when:
40-
- ansible_pkg_mgr == 'yum'
41-
- librdkafka_installed is defined and librdkafka_installed | bool
38+
- ansible_pkg_mgr == 'yum'
39+
- librdkafka_installed is defined and librdkafka_installed | bool
4240

4341
- name: upgrade | Upgrade GPFS file audit logging packages
4442
dnf:

roles/hdfs_install/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false

roles/nfs_install/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false

roles/nfs_upgrade/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false

roles/obj_install/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false
+4-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
---
22
- name: install | Install Scale object packages
33
yum:
4-
name: "{{ scale_install_all_packages }}"
5-
state: present
6-
disable_gpg_check: "{{ scale_disable_gpgcheck }}"
4+
name: "{{ scale_install_all_packages }}"
5+
state: present
6+
disable_gpg_check: "{{ scale_disable_gpgcheck }}"
77
when: inventory_hostname in scale_obj_nodes_list
88

99
- name: install | Get installed spectrum-scale-object
1010
shell: rpm -qa | grep spectrum-scale-object
1111
register: scale_package_status
1212
when: inventory_hostname in scale_obj_nodes_list
1313
ignore_errors: true
14-
args:
15-
warn: false
1614

1715
- name: install | Check if spectrum-scale-object package is installed
1816
assert:
1917
that:
20-
- scale_package_status.rc == 0
18+
- scale_package_status.rc == 0
2119
fail_msg: "spectrum-scale-object is not installed on {{ ansible_hostname }}"
2220
when: inventory_hostname in scale_obj_nodes_list

roles/obj_upgrade/handlers/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# handlers file for node
33
- name: yum-clean-metadata
44
command: yum clean metadata
5-
args:
6-
warn: false

0 commit comments

Comments
 (0)