Skip to content

Commit 28a6256

Browse files
authored
Remove bsc1224797 workaround for 15sp6 (#299)
15sp6 Image has be refreshed on 13th Nov 2024 including fence-agents-azure-arm by default. Also fix some Ansible lint warnings.
1 parent 253d0c6 commit 28a6256

1 file changed

Lines changed: 21 additions & 3 deletions

File tree

ansible/playbooks/tasks/azure-cluster-bootstrap.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
retries: 3
1515
delay: 60
1616

17-
- name: Ensure cluster dependencies for SLES >= 15-SP4 are installed
17+
# 15-SP6 Image refresh on 20241113 get it pre-installed
18+
- name: Ensure cluster dependencies for SLES 15-SP4 and 15-SP5 are installed
1819
community.general.zypper:
1920
name: "{{ item }}" # Caution, no version control here (yet)
2021
state: present
@@ -25,7 +26,8 @@
2526
retries: 3
2627
delay: 60
2728
when:
28-
- ansible_distribution_version is version('15.4', '>=') or
29+
- ansible_distribution_version is version('15.4', '==') or
30+
ansible_distribution_version is version('15.5', '==') or
2931
ansible_distribution_version is version('12.5', '==')
3032

3133
- name: Get the status of all extensions
@@ -47,13 +49,17 @@
4749
- name: Activate public cloud module [SLES 12]
4850
ansible.builtin.command:
4951
cmd: SUSEConnect -p sle-module-public-cloud/12/x86_64 # Only works on x86_64 for now!
52+
register: __suseconnect_sle_module_public_cloud_12
53+
changed_when: __suseconnect_sle_module_public_cloud_12.rc == 0
5054
when:
5155
- ansible_distribution_major_version == '12'
5256
- public_cloud_module != 'Registered'
5357

5458
- name: Activate public cloud module [SLES 15]
5559
ansible.builtin.command:
5660
cmd: "SUSEConnect -p sle-module-public-cloud/{{ ansible_distribution_version }}/x86_64" # Only works on x86_64 for now!
61+
register: __suseconnect_sle_module_public_cloud_15
62+
changed_when: __suseconnect_sle_module_public_cloud_15.rc == 0
5763
when:
5864
- ansible_distribution_major_version == '15'
5965
- public_cloud_module != 'Registered'
@@ -146,7 +152,7 @@
146152
- max_tasks_int | int < 4096
147153

148154
- name: Flush handlers
149-
meta: flush_handlers
155+
ansible.builtin.meta: flush_handlers
150156

151157
- name: Ensure 'CLOUD_NETCONFIG_MANAGE' is disabled for eth0
152158
ansible.builtin.lineinfile:
@@ -281,6 +287,8 @@
281287
- name: Ensure maintenance mode is active
282288
ansible.builtin.command:
283289
cmd: crm configure property maintenance-mode=true
290+
register: __crm_maintenance_true
291+
changed_when: __crm_maintenance_true.rc == 0
284292
when:
285293
- is_primary
286294
- crm_maintenance_mode is false or crm_maintenance_mode == 'unknown'
@@ -301,6 +309,8 @@
301309
pcmk_reboot_timeout=900
302310
pcmk_delay_max=15
303311
op monitor interval=3600 timeout=120
312+
register: __crm_cfg_fence_azure_arm_msi
313+
changed_when: __crm_cfg_fence_azure_arm_msi.rc == 0
304314
when:
305315
- is_primary
306316
- rsc_st_azure | length == 0
@@ -323,6 +333,8 @@
323333
power_timeout=240
324334
pcmk_reboot_timeout=900
325335
op monitor interval=3600 timeout=120
336+
register: __crm_cfg_fence_azure_arm_spn
337+
changed_when: __crm_cfg_fence_azure_arm_spn.rc == 0
326338
when:
327339
- is_primary
328340
- rsc_st_azure | length == 0
@@ -336,6 +348,8 @@
336348
ocf:heartbeat:azure-events-az
337349
meta allow-unhealthy-nodes=true
338350
op monitor interval=10s
351+
register: __crm_cfg_az_events
352+
changed_when: __crm_cfg_az_events.rc == 0
339353
when:
340354
- is_primary
341355
- rsc_azure_events | length == 0
@@ -346,6 +360,8 @@
346360
crm configure clone
347361
cln_azure-events-az
348362
rsc_azure-events-az
363+
register: __crm_cfg_azure_cln
364+
changed_when: __crm_cfg_azure_cln.rc == 0
349365
when:
350366
- is_primary
351367
- cln_azure_events| length == 0
@@ -367,6 +383,8 @@
367383
- name: Ensure maintenance mode is deactivated
368384
ansible.builtin.command:
369385
cmd: crm configure property maintenance-mode=false
386+
register: __crm_maintenance_false
387+
changed_when: __crm_maintenance_false.rc == 0
370388
when:
371389
- is_primary
372390
- crm_maintenance_mode is true or crm_maintenance_mode == 'unknown'

0 commit comments

Comments
 (0)