Skip to content

Commit cd525c9

Browse files
committed
fix linting errors in 2.20 with facts and register var names
1 parent 86e40e6 commit cd525c9

16 files changed

Lines changed: 68 additions & 67 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
([ -f /var/run/zypp.pid ] && [ -s /var/run/zypp.pid ]); do
9696
sleep 10;
9797
done'
98-
register: __packagekit_service_check
98+
register: __sap_general_preconfigure_register_packagekit
9999
changed_when: false
100-
until: __packagekit_service_check.rc == 0
100+
until: __sap_general_preconfigure_register_packagekit.rc == 0
101101
retries: 60
102102
when: "'packagekit.service' in ansible_facts.services"
103103

roles/sap_general_preconfigure/tasks/SLES/installation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
([ -f /var/run/zypp.pid ] && [ -s /var/run/zypp.pid ]); do
2323
sleep 10;
2424
done'
25-
register: __packagekit_service_check
25+
register: __sap_general_preconfigure_register_packagekit
2626
changed_when: false
27-
until: __packagekit_service_check.rc == 0
27+
until: __sap_general_preconfigure_register_packagekit.rc == 0
2828
retries: 60
2929
when: "'packagekit.service' in ansible_facts.services"
3030

roles/sap_hana_preconfigure/tasks/SLES/assert-installation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
([ -f /var/run/zypp.pid ] && [ -s /var/run/zypp.pid ]); do
5959
sleep 10;
6060
done'
61-
register: __packagekit_service_check
61+
register: __sap_hana_preconfigure_register_packagekit
6262
changed_when: false
63-
until: __packagekit_service_check.rc == 0
63+
until: __sap_hana_preconfigure_register_packagekit.rc == 0
6464
retries: 60
6565
when: "'packagekit.service' in ansible_facts.services"
6666

roles/sap_hana_preconfigure/tasks/SLES/installation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
([ -f /var/run/zypp.pid ] && [ -s /var/run/zypp.pid ]); do
2323
sleep 10;
2424
done'
25-
register: __packagekit_service_check
25+
register: __sap_hana_preconfigure_register_packagekit
2626
changed_when: false
27-
until: __packagekit_service_check.rc == 0
27+
until: __sap_hana_preconfigure_register_packagekit.rc == 0
2828
retries: 60
2929
when: "'packagekit.service' in ansible_facts.services"
3030

roles/sap_netweaver_preconfigure/tasks/SLES/assert-installation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
([ -f /var/run/zypp.pid ] && [ -s /var/run/zypp.pid ]); do
5757
sleep 10;
5858
done'
59-
register: __packagekit_service_check
59+
register: __sap_netweaver_preconfigure_register_packagekit
6060
changed_when: false
61-
until: __packagekit_service_check.rc == 0
61+
until: __sap_netweaver_preconfigure_register_packagekit.rc == 0
6262
retries: 60
6363
when: "'packagekit.service' in ansible_facts.services"
6464

roles/sap_netweaver_preconfigure/tasks/SLES/installation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
([ -f /var/run/zypp.pid ] && [ -s /var/run/zypp.pid ]); do
2323
sleep 10;
2424
done'
25-
register: __packagekit_service_check
25+
register: __sap_netweaver_preconfigure_register_packagekit
2626
changed_when: false
27-
until: __packagekit_service_check.rc == 0
27+
until: __sap_netweaver_preconfigure_register_packagekit.rc == 0
2828
retries: 60
2929
when: "'packagekit.service' in ansible_facts.services"
3030

roles/sap_storage_setup/tasks/generic_tasks/configure_local_filesystems.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
pesize: "{{ vg_item.pesize }}"
99
vg_options: "{{ vg_item.vg_opts }}"
1010
pv_options: "{{ vg_item.pv_opts }}"
11-
loop: "{{ volume_map }}"
11+
loop: "{{ __sap_storage_setup_fact_volume_map }}"
1212
loop_control:
1313
loop_var: vg_item
1414
label: "{{ vg_item.volume_group }}"
@@ -21,7 +21,7 @@
2121
size: 100%VG
2222
state: present
2323
opts: "{{ lv_item.lv_opts }}"
24-
loop: "{{ volume_map }}"
24+
loop: "{{ __sap_storage_setup_fact_volume_map }}"
2525
loop_control:
2626
loop_var: lv_item
2727
label: "{{ lv_item.volume_name }}"
@@ -32,7 +32,7 @@
3232
community.general.filesystem:
3333
fstype: "{{ fs_item.filesystem_type }}"
3434
dev: "/dev/{{ fs_item.volume_group }}/{{ fs_item.volume_name }}"
35-
loop: "{{ volume_map }}"
35+
loop: "{{ __sap_storage_setup_fact_volume_map }}"
3636
loop_control:
3737
loop_var: fs_item
3838
label: "{{ fs_item.volume_name }}"
@@ -45,7 +45,7 @@
4545
src: "/dev/{{ mnt_item.volume_group }}/{{ mnt_item.volume_name }}"
4646
fstype: "{{ mnt_item.filesystem_type }}"
4747
state: mounted # performs fstab entry and mount
48-
loop: "{{ volume_map }}"
48+
loop: "{{ __sap_storage_setup_fact_volume_map }}"
4949
loop_control:
5050
loop_var: mnt_item
5151
label: "{{ mnt_item.volume_name }}"

roles/sap_storage_setup/tasks/generic_tasks/configure_multipathing.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
# - no "links.uuids"
4040
# - no "partitions"
4141
# - "wwn" defined
42-
# - "size" matching any of the filesystems defined in {{ sap_storage_setup_new_mounts_fact }}
42+
# - "size" matching any of the filesystems defined in {{ __sap_storage_setup_fact_new_mounts }}
4343

4444
- name: SAP Storage Setup - (Multipathing) Make a list of unused WWNs of the requested sizes
4545
ansible.builtin.set_fact:
46-
available_devices_multipath: |
46+
__sap_storage_setup_fact_available_devices_multipath: |
4747
{% set av_disks = [] %}
4848
{% set all_disks = (ansible_devices | dict2items) %}
4949
{% for disk in all_disks %}
@@ -52,7 +52,7 @@
5252
and disk.value.partitions | length == 0
5353
and disk.value.holders | length == 0
5454
%}
55-
{%- for fs in sap_storage_setup_new_mounts_fact %}
55+
{%- for fs in __sap_storage_setup_fact_new_mounts %}
5656
{%- if fs.disk_size is defined
5757
and (fs.disk_size | string + 'GB') in (disk.value.size | regex_replace('(\.\d+\s*)', '')) %}
5858
{%- set add_to_list = av_disks.append(disk) %}
@@ -68,7 +68,7 @@
6868
# !!
6969

7070
# This task assigns device names for each volume to be created.
71-
# - sap_storage_setup_new_mounts_fact derived from extravars: sap_storage_setup_definition
71+
# - __sap_storage_setup_fact_new_mounts derived from extravars: sap_storage_setup_definition
7272
# and is dynamically generated during runtime to list only unconfigured filesystems
7373
# - ansible facts: ansible-devices
7474

@@ -77,13 +77,14 @@
7777

7878
- name: SAP Storage Setup - (Multipathing) Set fact for target filesystem device mapping
7979
ansible.builtin.set_fact:
80-
filesystem_device_map: "{{ filesystem_device_map | default([]) + __multipath_to_fs_device_map }}"
80+
__sap_storage_setup_fact_filesystem_device_map:
81+
"{{ __sap_storage_setup_fact_filesystem_device_map | default([]) + __multipath_to_fs_device_map }}"
8182
vars:
8283
__multipath_to_fs_device_map: |
8384
{% set device_map = [] %}
84-
{% set av_dev = (available_devices_multipath | dict2items) %}
85+
{% set av_dev = (__sap_storage_setup_fact_available_devices_multipath | dict2items) %}
8586
{% set assigned_dev = [] %}
86-
{% for fs in sap_storage_setup_new_mounts_fact -%}
87+
{% for fs in __sap_storage_setup_fact_new_mounts -%}
8788
{% set matching_dev = [] -%}
8889
8990
{%- if fs.disk_size is defined

roles/sap_storage_setup/tasks/generic_tasks/configure_nfs_filesystems.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
# Make sure paths and mountpoints are stripped from trailing '/'.
1717
# The '/' is added explicitly to the constructed paths.
1818

19-
# Parameter: sap_storage_setup_related_directories
19+
# Parameter: __sap_storage_setup_fact_related_directories
2020
# Param Type: list of dictionaries
2121
#
2222
# Debug sample for a node of host type 'nwas_abap_ascs':
2323
#
24-
# sap_storage_setup_related_directories:
24+
# __sap_storage_setup_fact_related_directories:
2525
# - dir_only: /DB1
2626
# mount_src: /my_dir/sapmnt
2727
# mountpoint: /sapmnt
2828
#
29-
# sap_storage_setup_related_directories:
29+
# __sap_storage_setup_fact_related_directories:
3030
# - mount_src: /my_dir/usr/sap/DB1/SYS
3131
# mountpoint: /usr/sap/DB1/SYS
3232
# - mount_src: /my_dir/usr/sap/DB1/ASCS00
3333
# mountpoint: /usr/sap/DB1/ASCS00
3434

3535
- name: SAP Storage Setup - ({{ nfs_item.name }}) Set fact for directories
3636
ansible.builtin.set_fact:
37-
sap_storage_setup_related_directories: |
37+
__sap_storage_setup_fact_related_directories: |
3838
{% set mount_list = [] %}
3939
4040
{%- if nfs_item.mountpoint | regex_replace('/$', '') == '/sapmnt' -%}
@@ -136,7 +136,7 @@
136136
ansible.builtin.stat:
137137
path: "{{ sap_storage_setup_tmpnfs_register.path }}{{ stat_item.mountpoint }}{{ stat_item.dir_only | default('') }}"
138138
register: sap_storage_setup_nfs_dir_register
139-
loop: "{{ sap_storage_setup_related_directories }}"
139+
loop: "{{ __sap_storage_setup_fact_related_directories }}"
140140
loop_control:
141141
loop_var: stat_item
142142
label: "{{ stat_item.mountpoint }}{{ stat_item.dir_only | default('') }}"
@@ -193,7 +193,7 @@
193193
fstype: "{{ nfs_item.nfs_filesystem_type | default(sap_storage_setup_nfs_filesystem_type) }}"
194194
opts: "{{ nfs_item.nfs_mount_options | default(sap_storage_setup_nfs_mount_options) }}"
195195
state: mounted
196-
loop: "{{ sap_storage_setup_related_directories }}"
196+
loop: "{{ __sap_storage_setup_fact_related_directories }}"
197197
loop_control:
198198
loop_var: mount_item
199199
label: "{{ mount_item.mountpoint }}"

roles/sap_storage_setup/tasks/generic_tasks/configure_swap.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
- name: SAP Storage Setup - (swap file) Check if file exists
2727
ansible.builtin.stat:
2828
path: "{{ swap_file.swap_path }}"
29-
register: check_swapfile
29+
register: __sap_storage_setup_register_check_swapfile
3030

3131
- name: SAP Storage Setup - (swap file) Allocate space
3232
ansible.builtin.shell: |
3333
fallocate -l {{ swap_file.disk_size | int * 1024 }}MB {{ swap_file.swap_path }}
3434
changed_when: true
3535
when:
36-
- not check_swapfile.stat.exists
36+
- not __sap_storage_setup_register_check_swapfile.stat.exists
3737

3838
- name: SAP Storage Setup - (swap file) Adjust file permissions
3939
ansible.builtin.file:
@@ -46,7 +46,7 @@
4646
swapon {{ swap_file.swap_path }}
4747
changed_when: true
4848
when:
49-
- not check_swapfile.stat.exists
49+
- not __sap_storage_setup_register_check_swapfile.stat.exists
5050

5151
- name: SAP Storage Setup - (swap file) Add fstab entry
5252
ansible.posix.mount:
@@ -86,7 +86,7 @@
8686
- name: SAP Storage Setup - Check if swap partition exists
8787
ansible.builtin.shell: |
8888
set -o pipefail && lsblk | grep SWAP || echo "no active swap"
89-
register: check_swap_partition
89+
register: __sap_storage_setup_register_check_swap_partition
9090
changed_when: false
9191

9292
- name: SAP Storage Setup - Add fstab entry for swap
@@ -103,6 +103,6 @@
103103
changed_when: true
104104
when:
105105
- not ansible_check_mode
106-
- swap_volume.lvm_lv_name | default("lv_swap") not in check_swap_partition.stdout
106+
- swap_volume.lvm_lv_name | default("lv_swap") not in __sap_storage_setup_register_check_swap_partition.stdout
107107

108108
### End of block: swap filesystem

0 commit comments

Comments
 (0)