diff --git a/redhat.sap_install-1.5.2-check_mode.patch b/redhat.sap_install-1.5.2-check_mode.patch new file mode 100644 index 0000000..e2400d5 --- /dev/null +++ b/redhat.sap_install-1.5.2-check_mode.patch @@ -0,0 +1,11 @@ +diff -up redhat.sap_install-1.5.2/roles/sap_general_preconfigure/tasks/RedHat/generic/configure-kernel-parameters.yml.me redhat.sap_install-1.5.2/roles/sap_general_preconfigure/tasks/RedHat/generic/configure-kernel-parameters.yml +--- redhat.sap_install-1.5.2/roles/sap_general_preconfigure/tasks/RedHat/generic/configure-kernel-parameters.yml.me 2025-01-31 11:52:17.015807194 +0100 ++++ redhat.sap_install-1.5.2/roles/sap_general_preconfigure/tasks/RedHat/generic/configure-kernel-parameters.yml 2025-01-31 11:53:10.121913231 +0100 +@@ -19,6 +19,7 @@ + - name: Construct the command for getting all current parameters of file '{{ sap_general_preconfigure_etc_sysctl_sap_conf }}' + ansible.builtin.command: awk 'BEGIN{FS="="; printf ("sysctl ")}{printf ("%s ", $1)}' "{{ sap_general_preconfigure_etc_sysctl_sap_conf }}" + register: __sap_general_preconfigure_register_sap_conf_sysctl_command ++ check_mode: false + changed_when: false + + # Reason for noqa: The command module tries to run the complete string as a single command diff --git a/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec index ee05a6b..b324971 100644 --- a/rhel-system-roles-sap.spec +++ b/rhel-system-roles-sap.spec @@ -45,7 +45,7 @@ Name: %{package_name} Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products -Version: 3.8.2 +Version: 3.8.3 Release: 1%{?dist} License: GPL-3.0-or-later Url: https://github.com/redhat-sap/community.sap_install @@ -59,6 +59,9 @@ Patch1: redhat.sap_install-1.3.4-add_tests.patch # add tools files Patch2: redhat.sap_install-1.3.4-add_tools.patch +# Fix check mode for sysctl +Patch3: redhat.sap_install-1.5.2-check_mode.patch + BuildArch: noarch Requires: rhel-system-roles @@ -124,6 +127,7 @@ Collection artifact for %{name}. This package contains: pushd %{github_repo_sap_install}-%{commit_id_sap_install}/ %patch -P1 -p1 %patch -P2 -p1 +%patch -P3 -p1 popd # unpack collection tar file @@ -131,6 +135,9 @@ popd mkdir -p %{collection_dir_sap_install} %{collection_dir_sap_infrastructure} # sap_install collection tar zxf %{github_repo_sap_install}-%{commit_id_sap_install}/%{collection_namespace}-%{collection_name_sap_install}-%{collection_sap_install_version}.tar.gz -C %{collection_dir_sap_install} +# apply Fix for check mode +cp -f %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_general_preconfigure/tasks/RedHat/generic/configure-kernel-parameters.yml \ +%{collection_dir_sap_install}/roles/sap_general_preconfigure/tasks/RedHat/generic/ # sap_infrastructure collection tar zxf %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/%{collection_namespace}-%{collection_name_sap_infrastructure}-%{commit_id_sap_infrastructure}.tar.gz -C %{collection_dir_sap_infrastructure} %endif @@ -237,6 +244,9 @@ popd %endif %changelog +* Fri Jan 31 2025 Than Ngo - 3.8.3-1 +- Related RHEL-74075, Fix checkmode for sysctl + * Tue Jan 28 2025 Than Ngo - 3.8.2-1 - Related: RHEL-74075, use redhat.sap_install for *_sap_install_collection