Skip to content

Commit a96da30

Browse files
authored
Merge pull request #910 from marcelmamula/sles16
sap_*_preconfigure, sap_ha_pacemaker_cluster: Vars loading reworked, Linting fixes for yes/no
2 parents 37a3d48 + 8680796 commit a96da30

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+350
-271
lines changed

roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
- name: Assert - Get info about enabled repos
5050
ansible.builtin.shell: set -o pipefail && subscription-manager repos --list-enabled | awk '/Repo ID:/{print $NF}'
5151
register: __sap_general_preconfigure_register_enabled_repos_assert
52-
changed_when: no
52+
changed_when: false
5353

5454
- name: Assert that all required repos are enabled
5555
ansible.builtin.assert:
@@ -69,8 +69,8 @@
6969
- name: Detect if and how the minor RHEL release is set
7070
ansible.builtin.shell: set -o pipefail && subscription-manager release | awk 'NF==2{printf $NF}NF!=2{print}'
7171
register: __sap_general_preconfigure_register_subscription_manager_release_assert
72-
changed_when: no
73-
ignore_errors: yes
72+
changed_when: false
73+
ignore_errors: true
7474

7575
- name: Assert that the RHEL release is locked correctly
7676
ansible.builtin.assert:
@@ -104,7 +104,7 @@
104104
- name: Check if required RHEL 7 package groups are installed # noqa command-instead-of-shell
105105
ansible.builtin.shell: "{{ __sap_general_preconfigure_fact_yum_group_list_installed_command_assert }}"
106106
register: __sap_general_preconfigure_register_yum_group_assert
107-
changed_when: no
107+
changed_when: false
108108

109109
- name: Assert that all required RHEL 7 package groups are installed
110110
ansible.builtin.assert:
@@ -133,7 +133,7 @@
133133
- name: Check if required RHEL 8 environment groups are installed # noqa command-instead-of-shell
134134
ansible.builtin.shell: "{{ __sap_general_preconfigure_fact_yum_envgroup_list_installed_command_assert }}"
135135
register: __sap_general_preconfigure_register_yum_envgroup_assert
136-
changed_when: no
136+
changed_when: false
137137

138138
- name: Assert that all required RHEL 8 environment groups are installed
139139
ansible.builtin.assert:
@@ -162,7 +162,7 @@
162162
set -o pipefail && yum info installed {{ __sap_general_preconfigure_required_ppc64le | map('quote') | join(' ') }} |
163163
awk '/Name/{n=$NF}/Version/{v=$NF}/Release/{r=$NF}/Description/{printf ("%s\n", n)}'
164164
register: __sap_general_preconfigure_register_required_ppc64le_packages_assert
165-
changed_when: no
165+
changed_when: false
166166
when: ansible_architecture == "ppc64le"
167167
ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}"
168168

@@ -223,9 +223,9 @@
223223
with_list: "{{ __sap_general_preconfigure_min_pkgs }}"
224224
loop_control:
225225
loop_var: pkg
226-
check_mode: no
226+
check_mode: false
227227
register: __sap_general_preconfigure_register_minpkglist_assert
228-
changed_when: no
228+
changed_when: false
229229

230230
- name: Assert that minimum required package versions are installed
231231
# If the output includes the string "is already installed" (case 2b), we have a PASS. Otherwise, it's a FAIL.
@@ -237,12 +237,12 @@
237237
loop_control:
238238
loop_var: line_item
239239
label: ""
240-
ignore_errors: yes
240+
ignore_errors: true
241241

242242
- name: Report if no minimum required package version is defined for this RHEL release
243243
ansible.builtin.debug:
244244
msg: "INFO: No minimum required package version defined (variable __sap_general_preconfigure_min_pkgs)."
245-
ignore_errors: yes
245+
ignore_errors: true
246246
when: not __sap_general_preconfigure_min_pkgs | d([])
247247

248248
# Reason for noqa: The yum module appears to not support the check-update option
@@ -265,7 +265,7 @@
265265
- name: Report if checking for possible package updates is not requested
266266
ansible.builtin.debug:
267267
msg: "INFO: Not checking for possible package updates (variable sap_general_preconfigure_update)."
268-
ignore_errors: yes
268+
ignore_errors: true
269269
when: not sap_general_preconfigure_update
270270

271271
- name: "Assert - Set needs-restarting command in case of RHEL 7"

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-dns-name-resolution.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
fail_msg: "FAIL: The DNS domain is not configured! So variable 'sap_general_preconfigure_domain' needs to be configured!"
88
success_msg: "PASS: The DNS domain is configured."
99
# ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}"
10-
ignore_errors: yes
10+
ignore_errors: true
1111

1212
- name: Assert that variable sap_general_preconfigure_domain is set
1313
ansible.builtin.assert:
@@ -25,8 +25,8 @@
2525
- name: Check if IP address for sap_general_preconfigure_hostname.sap_general_preconfigure_domain is resolved correctly
2626
ansible.builtin.command: dig {{ sap_general_preconfigure_hostname }}.{{ sap_general_preconfigure_domain }} +short
2727
register: __sap_general_preconfigure_register_dig_short_assert
28-
ignore_errors: yes
29-
changed_when: no
28+
ignore_errors: true
29+
changed_when: false
3030
when: "'bind-utils' in ansible_facts.packages"
3131

3232
- name: Assert that ansible_default_ipv4.address is set

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-etc-hosts.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
- name: Check if ipv4 address, FQDN, and hostname are once in /etc/hosts
1212
ansible.builtin.command: awk 'BEGIN{a=0}/^{{ sap_general_preconfigure_ip }}\s/&&/\s{{ sap_general_preconfigure_hostname }}.{{ sap_general_preconfigure_domain }}\s/&&(/\s{{ sap_general_preconfigure_hostname }}\s/||/\s{{ sap_general_preconfigure_hostname }}$/){a++}END{print a}' /etc/hosts
1313
register: __sap_general_preconfigure_register_ipv4_fqdn_sap_hostname_once_assert
14-
ignore_errors: yes
15-
changed_when: no
14+
ignore_errors: true
15+
changed_when: false
1616

1717
- name: Assert that ipv4 address, FQDN, and hostname are once in /etc/hosts
1818
ansible.builtin.assert:
@@ -25,8 +25,8 @@
2525
- name: Count the number of sap_general_preconfigure_ip ({{ sap_general_preconfigure_ip }}) entries in /etc/hosts
2626
ansible.builtin.command: awk 'BEGIN{a=0}/^{{ sap_general_preconfigure_ip }}\s/{a++}END{print a}' /etc/hosts
2727
register: __sap_general_preconfigure_register_sap_ip_once_assert
28-
ignore_errors: yes
29-
changed_when: no
28+
ignore_errors: true
29+
changed_when: false
3030

3131
- name: Assert that there is exactly one line containing {{ sap_general_preconfigure_ip }} in /etc/hosts
3232
ansible.builtin.assert:
@@ -40,8 +40,8 @@
4040
/\s{{ sap_general_preconfigure_hostname }}.{{ sap_general_preconfigure_domain }}\s/||
4141
/\s{{ sap_general_preconfigure_hostname }}.{{ sap_general_preconfigure_domain }}$/{a++}END{print a}' /etc/hosts
4242
register: __sap_general_preconfigure_register_fqdn_once_assert
43-
ignore_errors: yes
44-
changed_when: no
43+
ignore_errors: true
44+
changed_when: false
4545

4646
- name: Assert that there is just one line containing {{ sap_general_preconfigure_hostname }}.{{ sap_general_preconfigure_domain }} in /etc/hosts
4747
ansible.builtin.assert:
@@ -55,8 +55,8 @@
5555
/\s{{ sap_general_preconfigure_hostname }}\s/||
5656
/\s{{ sap_general_preconfigure_hostname }}$/{a++}END{print a}' /etc/hosts
5757
register: __sap_general_preconfigure_register_sap_hostname_once_assert
58-
ignore_errors: yes
59-
changed_when: no
58+
ignore_errors: true
59+
changed_when: false
6060

6161
- name: Assert that there is just one line containing {{ sap_general_preconfigure_hostname }} in /etc/hosts
6262
ansible.builtin.assert:
@@ -68,8 +68,8 @@
6868
- name: Test hostname -s
6969
ansible.builtin.shell: test "$(hostname -s)" = "$(hostname)"
7070
register: __sap_general_preconfigure_register_hostname_s_assert
71-
ignore_errors: yes
72-
changed_when: no
71+
ignore_errors: true
72+
changed_when: false
7373

7474
- name: Assert that hostname -s matches the output of hostname
7575
ansible.builtin.assert:
@@ -81,8 +81,8 @@
8181
- name: Test hostname -f
8282
ansible.builtin.shell: test "$(hostname -f)" = "$(hostname).$(hostname -d)"
8383
register: __sap_general_preconfigure_register_hostname_f_assert
84-
ignore_errors: yes
85-
changed_when: no
84+
ignore_errors: true
85+
changed_when: false
8686

8787
- name: Assert that hostname -f matches the output of hostname.hostname -d
8888
ansible.builtin.assert:

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-firewall.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
- name: Get status of firewalld # noqa command-instead-of-module
1919
ansible.builtin.command: systemctl status firewalld
2020
register: __sap_general_preconfigure_register_firewalld_status_assert
21-
ignore_errors: yes
22-
changed_when: no
23-
no_log: yes
21+
ignore_errors: true
22+
changed_when: false
23+
no_log: true
2424

2525
- name: Assert that firewalld is disabled
2626
ansible.builtin.assert:

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-hostname.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
- name: Check if hostname is set
55
ansible.builtin.command: hostname
66
register: __sap_general_preconfigure_register_hostname_assert
7-
ignore_errors: yes
8-
changed_when: no
7+
ignore_errors: true
8+
changed_when: false
99

1010
- name: Assert that the output of hostname matches the content of variable sap_general_preconfigure_hostname
1111
ansible.builtin.assert:

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-kernel-parameters-loop-block.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
- name: Get {{ line_item.name }} from {{ sap_general_preconfigure_etc_sysctl_sap_conf }}
77
ansible.builtin.shell: awk 'BEGIN{FS="="}/{{ line_item.name }}/{gsub ("^\\s*", "", $NF); print $NF}' {{ sap_general_preconfigure_etc_sysctl_sap_conf }}
88
register: __sap_general_preconfigure_register_sysctl_sap_conf_kernel_parameter_assert
9-
changed_when: no
10-
ignore_errors: yes
9+
changed_when: false
10+
ignore_errors: true
1111
when: __sap_general_preconfigure_register_stat_sysctl_sap_conf_assert.stat.exists
1212

1313
- name: Assert that {{ line_item.name }} is set correctly in {{ sap_general_preconfigure_etc_sysctl_sap_conf }}
@@ -23,8 +23,8 @@
2323
- name: Get {{ line_item.name }} from sysctl
2424
ansible.builtin.shell: sysctl -n {{ line_item.name }} | awk '{gsub ("\t", " "); print}'
2525
register: __sap_general_preconfigure_register_sysctl_kernel_parameter_assert
26-
changed_when: no
27-
ignore_errors: yes
26+
changed_when: false
27+
ignore_errors: true
2828

2929
- name: Assert that {{ line_item.name }} is set correctly as per sysctl
3030
ansible.builtin.assert:

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-nofile-limits.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
- name: Check if the hard limit of nofile for group sapsys is 1048576
55
ansible.builtin.command: awk '!/^#/&&/sapsys/&&/nofile/&&/hard/{print $NF}' /etc/security/limits.d/99-sap.conf
66
register: __sap_general_preconfigure_register_limits_sap_conf_nofile_hard_assert
7-
changed_when: no
8-
ignore_errors: yes
7+
changed_when: false
8+
ignore_errors: true
99
when:
1010
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
1111
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg
@@ -25,8 +25,8 @@
2525
- name: Check if the soft limit of nofile for group sapsys is 1048576
2626
ansible.builtin.command: awk '!/^#/&&/sapsys/&&/nofile/&&/soft/{print $NF}' /etc/security/limits.d/99-sap.conf
2727
register: __sap_general_preconfigure_register_limits_sap_conf_nofile_soft_assert
28-
changed_when: no
29-
ignore_errors: yes
28+
changed_when: false
29+
ignore_errors: true
3030
when:
3131
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
3232
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg
@@ -46,8 +46,8 @@
4646
- name: Get the hard limit of nofile for the database group
4747
ansible.builtin.command: awk '!/^#/&&/@{{ sap_general_preconfigure_db_group_name }}/&&/nofile/&&/hard/{print $NF}' /etc/security/limits.d/99-sap.conf
4848
register: __sap_general_preconfigure_register_limits_sap_conf_db_group_nofile_hard_assert
49-
changed_when: no
50-
ignore_errors: yes
49+
changed_when: false
50+
ignore_errors: true
5151
when:
5252
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
5353
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg
@@ -67,8 +67,8 @@
6767
- name: Get the soft limit of nofile for the database group
6868
ansible.builtin.command: awk '!/^#/&&/@{{ sap_general_preconfigure_db_group_name }}/&&/nofile/&&/soft/{print $NF}' /etc/security/limits.d/99-sap.conf
6969
register: __sap_general_preconfigure_register_limits_sap_conf_db_group_nofile_soft_assert
70-
changed_when: no
71-
ignore_errors: yes
70+
changed_when: false
71+
ignore_errors: true
7272
when:
7373
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
7474
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-nproc-limits.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
- name: Check if the hard limit of nproc for group sapsys is unlimited
55
ansible.builtin.command: awk '/sapsys/&&/nproc/&&/hard/{print $NF}' /etc/security/limits.d/99-sap.conf
66
register: __sap_general_preconfigure_register_limits_sap_conf_nproc_hard_assert
7-
changed_when: no
8-
ignore_errors: yes
7+
changed_when: false
8+
ignore_errors: true
99
when:
1010
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
1111
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg
@@ -25,8 +25,8 @@
2525
- name: Check if the soft limit of nproc for group sapsys is unlimited
2626
ansible.builtin.command: awk '/sapsys/&&/nproc/&&/soft/{print $NF}' /etc/security/limits.d/99-sap.conf
2727
register: __sap_general_preconfigure_register_limits_sap_conf_nproc_soft_assert
28-
changed_when: no
29-
ignore_errors: yes
28+
changed_when: false
29+
ignore_errors: true
3030
when:
3131
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
3232
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg
@@ -46,8 +46,8 @@
4646
- name: Get the hard limit of nproc for the database group
4747
ansible.builtin.command: awk '/@{{ sap_general_preconfigure_db_group_name }}/&&/nproc/&&/hard/{print $NF}' /etc/security/limits.d/99-sap.conf
4848
register: __sap_general_preconfigure_register_limits_sap_conf_db_group_nproc_hard_assert
49-
changed_when: no
50-
ignore_errors: yes
49+
changed_when: false
50+
ignore_errors: true
5151
when:
5252
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
5353
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg
@@ -69,8 +69,8 @@
6969
- name: Get the soft limit of nproc for the database group
7070
ansible.builtin.command: awk '/@{{ sap_general_preconfigure_db_group_name }}/&&/nproc/&&/soft/{print $NF}' /etc/security/limits.d/99-sap.conf
7171
register: __sap_general_preconfigure_register_limits_sap_conf_db_group_nproc_soft_assert
72-
changed_when: no
73-
ignore_errors: yes
72+
changed_when: false
73+
ignore_errors: true
7474
when:
7575
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.exists
7676
- __sap_general_preconfigure_register_stat_limits_sap_conf_assert.stat.isreg

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-selinux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
- name: Info about SELinux being set to 'enforcing'
1717
ansible.builtin.debug:
1818
msg: "INFO: The SELinux state has been set to 'enforcing' (variable sap_general_preconfigure_selinux_state)."
19-
ignore_errors: yes
19+
ignore_errors: true
2020
when: "sap_general_preconfigure_selinux_state == 'enforcing'"
2121

2222
- name: Warn about how SELinux would be set when role is run in normal mode
2323
ansible.builtin.debug:
2424
msg: "INFO: When running in normal mode, the role will set the SELinux state to '{{ sap_general_preconfigure_selinux_state }}'
2525
(variable sap_general_preconfigure_selinux_state)."
26-
ignore_errors: yes
26+
ignore_errors: true
2727
when: "sap_general_preconfigure_selinux_state != 'enforcing'"
2828

2929
- name: "Check if the permanent configuration of the SELinux state is '{{ sap_general_preconfigure_selinux_state }}'"
3030
ansible.builtin.command: awk 'BEGIN{FS="="}/^SELINUX=/{print $NF}' /etc/selinux/config
3131
register: __sap_general_preconfigure_register_selinux_conf_assert
3232
changed_when: false
33-
ignore_errors: yes
33+
ignore_errors: true
3434
when: __sap_general_preconfigure_register_stat_selinux_conf_assert.stat.isreg
3535

3636
- name: "Assert that the permanent configuration of the SELinux state is set to '{{ sap_general_preconfigure_selinux_state }}'"

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-tmpfs.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
- name: Check the size of tmpfs
55
ansible.builtin.command: awk '/\/dev\/shm/&&/tmpfs/{gsub ("defaults,size=", "", $4); print $4}' /etc/fstab
66
register: __sap_general_preconfigure_register_fstab_tmpfs_size_gb_assert
7-
ignore_errors: yes
8-
changed_when: no
7+
ignore_errors: true
8+
changed_when: false
99

1010
- name: Assert that there is an entry for tmpfs in /etc/fstab
1111
ansible.builtin.assert:
@@ -26,8 +26,8 @@
2626
- name: Check if /dev/shm is available and has the expected size
2727
ansible.builtin.shell: df -kl /dev/shm | awk '/\/dev\/shm/&&/tmpfs/{printf ("%.0fG\n", $2/1024/1024)}'
2828
register: __sap_general_preconfigure_register_df_shm_assert
29-
ignore_errors: yes
30-
changed_when: no
29+
ignore_errors: true
30+
changed_when: false
3131

3232
- name: Assert that the current size of tmpfs is large enough as per df output
3333
ansible.builtin.assert:

roles/sap_general_preconfigure/tasks/RedHat/generic/assert-uuidd.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
- name: Get status of uuidd.socket # noqa command-instead-of-module
2121
ansible.builtin.command: systemctl status uuidd.socket
2222
register: __sap_general_preconfigure_register_uuidd_socket_status_assert
23-
ignore_errors: yes
24-
changed_when: no
23+
ignore_errors: true
24+
changed_when: false
2525

2626
- name: Report uuidd.socket service status
2727
ansible.builtin.debug:

roles/sap_general_preconfigure/tasks/RedHat/generic/configure-etc-hosts.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
fi
6868
register: __sap_general_preconfigure_register_duplicate_ip_check
6969
changed_when: false
70-
ignore_errors: yes
70+
ignore_errors: true
7171
when: not ansible_check_mode
7272

7373
- name: Verify that variable sap_general_preconfigure_domain is set
@@ -89,7 +89,7 @@
8989
path: /etc/hosts
9090
regexp: '^{{ sap_general_preconfigure_ip }}\s'
9191
line: "{{ sap_general_preconfigure_ip }} {{ sap_general_preconfigure_hostname }}.{{ sap_general_preconfigure_domain }} {{ sap_general_preconfigure_hostname }}{{ __sap_general_preconfigure_register_sap_hostname_aliases.stdout }}"
92-
backup: yes
92+
backup: true
9393
when:
9494
- not ansible_check_mode
9595
- sap_general_preconfigure_domain | length > 0

roles/sap_general_preconfigure/tasks/RedHat/generic/configure-firewall.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
ansible.builtin.systemd:
66
name: firewalld
77
state: stopped
8-
enabled: no
8+
enabled: false
99
when: "'firewalld' in ansible_facts.packages"

roles/sap_general_preconfigure/tasks/RedHat/generic/configure-kernel-parameters.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
- name: Set kernel parameters
55
ansible.builtin.lineinfile:
66
path: "{{ sap_general_preconfigure_etc_sysctl_sap_conf }}"
7-
create: yes
7+
create: true
88
mode: '0644'
99
regexp: ^{{ line_item.name }}.*
1010
line: "{{ line_item.name }}={{ line_item.value }}"

0 commit comments

Comments
 (0)