From 08b39931e41bcdd65c2a0575a2c9de2cecaf13fe Mon Sep 17 00:00:00 2001 From: Rob Dobozy Date: Fri, 3 Jan 2025 19:02:36 +0000 Subject: [PATCH 1/3] sap_ha_pacemaker_cluster: To prevent errors when __sap_ha_pacemaker_cluster_fence_agent_packages_platform not defined (this is case for on-prem/bare metal) --- roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml index 33dbe95d..8b9abf95 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml @@ -67,7 +67,7 @@ ansible.builtin.set_fact: __sap_ha_pacemaker_cluster_fence_agent_packages: "{{ (__sap_ha_pacemaker_cluster_fence_agent_packages_minimal_combined - + __sap_ha_pacemaker_cluster_fence_agent_packages_platform + + __sap_ha_pacemaker_cluster_fence_agent_packages_platform | d([]) + sap_ha_pacemaker_cluster_fence_agent_packages) | unique }}" vars: From dff226e0bce4b284a8ce8a2fc9452d220d048294 Mon Sep 17 00:00:00 2001 From: Rob Dobozy Date: Fri, 3 Jan 2025 19:07:07 +0000 Subject: [PATCH 2/3] sap_ha_pacemaker_cluster: Variable incorrectly defined as list. Fix to prevent errors when setting corosync totem errors on bare metal RHEL --- roles/sap_ha_pacemaker_cluster/vars/RedHat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sap_ha_pacemaker_cluster/vars/RedHat.yml b/roles/sap_ha_pacemaker_cluster/vars/RedHat.yml index e9dd9762..c4bd138c 100644 --- a/roles/sap_ha_pacemaker_cluster/vars/RedHat.yml +++ b/roles/sap_ha_pacemaker_cluster/vars/RedHat.yml @@ -57,7 +57,7 @@ __sap_ha_pacemaker_cluster_command: # Default corosync options - OS specific __sap_ha_pacemaker_cluster_corosync_totem_default: - options: [] + options: {} # Make sure that there is always the minimal default fed into the included role. # This is combined with the custom list 'sap_ha_pacemaker_cluster_fence_agent_packages'. From 984957c45c417c87ffee1020cf3d696372b220fa Mon Sep 17 00:00:00 2001 From: Rob Dobozy Date: Wed, 8 Jan 2025 15:04:36 +0000 Subject: [PATCH 3/3] sap_ha_pacemaker_cluster: Fix variable definition for fence agent packages platform to prevent errors --- roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml | 2 +- roles/sap_ha_pacemaker_cluster/vars/main.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml index 8b9abf95..33dbe95d 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml @@ -67,7 +67,7 @@ ansible.builtin.set_fact: __sap_ha_pacemaker_cluster_fence_agent_packages: "{{ (__sap_ha_pacemaker_cluster_fence_agent_packages_minimal_combined - + __sap_ha_pacemaker_cluster_fence_agent_packages_platform | d([]) + + __sap_ha_pacemaker_cluster_fence_agent_packages_platform + sap_ha_pacemaker_cluster_fence_agent_packages) | unique }}" vars: diff --git a/roles/sap_ha_pacemaker_cluster/vars/main.yml b/roles/sap_ha_pacemaker_cluster/vars/main.yml index 3ea75301..7bc19eef 100644 --- a/roles/sap_ha_pacemaker_cluster/vars/main.yml +++ b/roles/sap_ha_pacemaker_cluster/vars/main.yml @@ -93,6 +93,7 @@ __sap_ha_pacemaker_cluster_pcmk_host_map: '' # Pre-define internal optional parameters to avoid defaults in the code: __sap_ha_pacemaker_cluster_sap_extra_packages: [] __sap_ha_pacemaker_cluster_platform_extra_packages: [] +__sap_ha_pacemaker_cluster_fence_agent_packages_platform: [] __sap_ha_pacemaker_cluster_cluster_properties: [] __sap_ha_pacemaker_cluster_resource_defaults: