From e215bacbc1dca40835442c5bc1c0d52b0f5310da Mon Sep 17 00:00:00 2001 From: Bernd Finger Date: Thu, 23 Jan 2025 10:30:54 +0100 Subject: [PATCH 1/2] sap_general_preconfigure: Fix check mode Fixes issue #934. Signed-off-by: Bernd Finger --- roles/sap_general_preconfigure/tasks/sapnote/2369910.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml b/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml index 20de2aa0..85a256c4 100644 --- a/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml +++ b/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml @@ -14,6 +14,8 @@ - sap_general_preconfigure_configure_locale block: - name: Configure an English locale + ansible.builtin.command: "localectl set-locale LANG={{ sap_general_preconfigure_default_locale }}" + changed_when: true when: - sap_general_preconfigure_default_locale is defined and sap_general_preconfigure_default_locale - sap_general_preconfigure_default_locale == 'C.UTF-8' or @@ -21,13 +23,12 @@ sap_general_preconfigure_default_locale.startswith('en_') and (sap_general_preconfigure_default_locale.endswith('UTF-8') or sap_general_preconfigure_default_locale.endswith('utf8')) - ansible.builtin.command: "localectl set-locale LANG={{ sap_general_preconfigure_default_locale }}" - changed_when: true - name: Get the current default locale ansible.builtin.command: awk '{gsub("\"","")}/^LANG=/&&(/=C\./||/=en_/)&&(/utf8$/||/UTF-8$/){print}' /etc/locale.conf - changed_when: false + check_mode: false register: __sap_general_preconfigure_current_default_locale + changed_when: false - name: Assert that an English locale is the default ansible.builtin.assert: From 8e13a6c1d359ed322973bbd8589bcb5f1693979d Mon Sep 17 00:00:00 2001 From: Bernd Finger Date: Thu, 23 Jan 2025 11:26:14 +0100 Subject: [PATCH 2/2] sap_ha_pacemaker_cluster: Fix codespell New codespell error after codespell update from 2.3.0 to 2.4.0 Signed-off-by: Bernd Finger --- roles/sap_ha_pacemaker_cluster/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sap_ha_pacemaker_cluster/tasks/main.yml b/roles/sap_ha_pacemaker_cluster/tasks/main.yml index 95c43eac..bdc3b3b1 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/main.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/main.yml @@ -297,7 +297,7 @@ # Save all the constructed cluster parameters into a vars file. # -# This will help re-using ha_cluster afterwards without losing the already +# This will help reusing ha_cluster afterwards without losing the already # configured resources and constraints. # The ha_cluster role will otherwise remove configuration that is not part # of the parameters provided during any subsequent run outside of the current