Skip to content

Commit 0e71a4f

Browse files
authored
Merge pull request #1119 from marcelmamula/linting_ha
sap_ha_pacemaker_cluster:: Fix linting errors
2 parents 2c01d26 + 0a736a2 commit 0e71a4f

2 files changed

Lines changed: 23 additions & 21 deletions

File tree

roles/sap_ha_pacemaker_cluster/tasks/construct_final_hacluster_vars.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
# __sap_ha_pacemaker_cluster_resource_primitives ha_cluster_resource_primitives
3030
# __sap_ha_pacemaker_cluster_corosync_totem ha_cluster_totem
3131

32+
# NOTE: noqa var-naming[no-role-prefix] is required when setting variable names for other roles.
33+
3234
# Combines SBD stonith options with ha_cluster if it was not imported as extra var.
3335
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Include SBD config into 'ha_cluster'" # noqa jinja[spacing]
3436
when:
@@ -43,102 +45,102 @@
4345
4446
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster'"
4547
when: __sap_ha_pacemaker_cluster_ha_cluster is defined
46-
ansible.builtin.set_fact:
48+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
4749
ha_cluster: "{{ __sap_ha_pacemaker_cluster_ha_cluster }}"
4850

4951
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_cluster_name'"
5052
when: __sap_ha_pacemaker_cluster_cluster_name is defined
51-
ansible.builtin.set_fact:
53+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
5254
ha_cluster_cluster_name: "{{ __sap_ha_pacemaker_cluster_cluster_name }}"
5355

5456
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_cluster_properties'"
5557
when: __sap_ha_pacemaker_cluster_cluster_properties is defined
56-
ansible.builtin.set_fact:
58+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
5759
ha_cluster_cluster_properties: "{{ __sap_ha_pacemaker_cluster_cluster_properties }}"
5860

5961
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_resource_defaults'"
6062
when: __sap_ha_pacemaker_cluster_resource_defaults is defined
61-
ansible.builtin.set_fact:
63+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
6264
ha_cluster_resource_defaults: "{{ __sap_ha_pacemaker_cluster_resource_defaults }}"
6365

6466
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_resource_operation_defaults'"
6567
when: __sap_ha_pacemaker_cluster_resource_operation_defaults is defined
66-
ansible.builtin.set_fact:
68+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
6769
ha_cluster_resource_operation_defaults: "{{ __sap_ha_pacemaker_cluster_resource_operation_defaults }}"
6870

6971
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_constraints_colocation'"
7072
when: __sap_ha_pacemaker_cluster_constraints_colocation is defined
71-
ansible.builtin.set_fact:
73+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
7274
ha_cluster_constraints_colocation: "{{ __sap_ha_pacemaker_cluster_constraints_colocation }}"
7375

7476
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_constraints_location'"
7577
when: __sap_ha_pacemaker_cluster_constraints_location is defined
76-
ansible.builtin.set_fact:
78+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
7779
ha_cluster_constraints_location: "{{ __sap_ha_pacemaker_cluster_constraints_location }}"
7880

7981
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_constraints_order'"
8082
when: __sap_ha_pacemaker_cluster_constraints_order is defined
81-
ansible.builtin.set_fact:
83+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
8284
ha_cluster_constraints_order: "{{ __sap_ha_pacemaker_cluster_constraints_order }}"
8385

8486
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_extra_packages'"
8587
when: __sap_ha_pacemaker_cluster_extra_packages is defined
86-
ansible.builtin.set_fact:
88+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
8789
ha_cluster_extra_packages: "{{ __sap_ha_pacemaker_cluster_extra_packages }}"
8890

8991
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_zypper_patterns'"
9092
when: __sap_ha_pacemaker_cluster_zypper_patterns is defined and ansible_os_family == 'Suse'
91-
ansible.builtin.set_fact:
93+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
9294
ha_cluster_zypper_patterns: "{{ __sap_ha_pacemaker_cluster_zypper_patterns }}"
9395

9496
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_fence_agent_packages'"
9597
when: __sap_ha_pacemaker_cluster_fence_agent_packages is defined
96-
ansible.builtin.set_fact:
98+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
9799
ha_cluster_fence_agent_packages: "{{ __sap_ha_pacemaker_cluster_fence_agent_packages }}"
98100

99101
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_hacluster_password'"
100102
when: __sap_ha_pacemaker_cluster_hacluster_user_password is defined
101-
ansible.builtin.set_fact:
103+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
102104
ha_cluster_hacluster_password: "{{ __sap_ha_pacemaker_cluster_hacluster_user_password }}"
103105
no_log: true # secure the credential
104106

105107
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_repos'"
106108
when: __sap_ha_pacemaker_cluster_repos is defined
107-
ansible.builtin.set_fact:
109+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
108110
__ha_cluster_repos: "{{ __sap_ha_pacemaker_cluster_repos }}"
109111

110112
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_resource_clones'"
111113
when: __sap_ha_pacemaker_cluster_resource_clones is defined
112-
ansible.builtin.set_fact:
114+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
113115
ha_cluster_resource_clones: "{{ __sap_ha_pacemaker_cluster_resource_clones }}"
114116

115117
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_resource_groups'"
116118
when: __sap_ha_pacemaker_cluster_resource_groups is defined
117-
ansible.builtin.set_fact:
119+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
118120
ha_cluster_resource_groups: "{{ __sap_ha_pacemaker_cluster_resource_groups }}"
119121

120122
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_resource_primitives'"
121123
when: __sap_ha_pacemaker_cluster_resource_primitives is defined
122-
ansible.builtin.set_fact:
124+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
123125
ha_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives }}"
124126
no_log: true # be paranoid, there could be credentials in it
125127

126128
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_totem'"
127129
when: __sap_ha_pacemaker_cluster_corosync_totem is defined
128-
ansible.builtin.set_fact:
130+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
129131
ha_cluster_totem: "{{ __sap_ha_pacemaker_cluster_corosync_totem }}"
130132

131133
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_transport'"
132134
when: __sap_ha_pacemaker_cluster_corosync_transport is defined
133-
ansible.builtin.set_fact:
135+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
134136
ha_cluster_transport: "{{ __sap_ha_pacemaker_cluster_corosync_transport }}"
135137

136138
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_sbd_options'"
137139
when: __sap_ha_pacemaker_cluster_sbd_options is defined
138-
ansible.builtin.set_fact:
140+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
139141
ha_cluster_sbd_options: "{{ __sap_ha_pacemaker_cluster_sbd_options }}"
140142

141143
- name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_sbd_enabled'"
142144
when: __sap_ha_pacemaker_cluster_sbd_enabled is defined
143-
ansible.builtin.set_fact:
145+
ansible.builtin.set_fact: # noqa var-naming[no-role-prefix]
144146
ha_cluster_sbd_enabled: "{{ __sap_ha_pacemaker_cluster_sbd_enabled }}"

roles/sap_ha_pacemaker_cluster/tasks/pre_steps_nwas_cs_ers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
ansible.builtin.set_fact:
6565
sap_ha_pacemaker_cluster_instance_service_all_fact: "{{
6666
(sap_ha_pacemaker_cluster_instance_service_all_fact | d([])
67-
+ hostvars[task_host_item].sap_ha_pacemaker_cluster_instance_service_node_fact)
67+
+ hostvars[task_host_item].sap_ha_pacemaker_cluster_instance_service_node_fact | d([]))
6868
| unique
6969
}}"
7070
loop: "{{ ansible_play_hosts }}"

0 commit comments

Comments
 (0)