rpms/rhel-system-roles-sap
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: RHEL-73378, Fix checkmode for sysctl and in sap_hana_preconfigure

Browse Source
This commit is contained in:
Than Ngo 2025-02-04 11:25:24 +01:00
parent 661e4e7a63
commit 13315810a4
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
redhat.sap_install-1.5.2-check_mode.patch Normal file
View File

@ -0,0 +1,36 @@
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 -up redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/RedHat/generic/configure-thp.yml.me redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/RedHat/generic/configure-thp.yml
--- redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/RedHat/generic/configure-thp.yml.me 2025-02-04 10:24:11.654505302 +0100
+++ redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/RedHat/generic/configure-thp.yml 2025-02-04 10:24:48.064360920 +0100
@@ -43,7 +43,9 @@
- name: Set THP to '{{ __sap_hana_preconfigure_fact_thp }}' on the running system
ansible.builtin.shell: echo '{{ __sap_hana_preconfigure_fact_thp }}' > /sys/kernel/mm/transparent_hugepage/enabled
changed_when: true
- when: __sap_hana_preconfigure_register_thp_status_before.stdout.split('[')[1].split(']')[0] != __sap_hana_preconfigure_fact_thp
+ when:
+ - not ansible_check_mode
+ - __sap_hana_preconfigure_register_thp_status_before.stdout.split('[')[1].split(']')[0] != __sap_hana_preconfigure_fact_thp
- name: Configure - Get the status of THP
ansible.builtin.command: cat /sys/kernel/mm/transparent_hugepage/enabled
diff -up redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/sapnote/2382421.yml.me redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/sapnote/2382421.yml
--- redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/sapnote/2382421.yml.me 2025-02-04 10:24:25.595832908 +0100
+++ redhat.sap_install-1.5.2/roles/sap_hana_preconfigure/tasks/sapnote/2382421.yml 2025-02-04 10:24:48.064360920 +0100
@@ -72,6 +72,7 @@
- name: Construct the command for getting all current parameters of file '{{ __sap_hana_preconfigure_etc_sysctl_saphana_conf }}'
ansible.builtin.command: awk 'BEGIN{FS="="; printf ("sysctl ")}{printf ("%s ", $1)}' "{{ __sap_hana_preconfigure_etc_sysctl_saphana_conf }}"
register: __sap_hana_preconfigure_register_saphana_conf_sysctl_command
+ check_mode: false
changed_when: false
- name: Get all currently active values of the parameters of file '{{ __sap_hana_preconfigure_etc_sysctl_saphana_conf }}'

13
rhel-system-roles-sap.spec
View File

@ -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.4
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
@ -117,6 +120,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
@ -124,6 +128,10 @@ 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}
# sap_install collection, Fix check mode
pushd %{collection_dir_sap_install}/
%patch -P3 -p1
popd
# 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
@ -236,6 +244,9 @@ popd
%endif
%changelog
* Tue Feb 04 2025 Than Ngo <than@redhat.com> - 3.8.4-1
- Related: RHEL-73378, Fix checkmode for sysctl and in sap_hana_preconfigure
* Wed Jan 29 2025 Than Ngo <than@redhat.com> - 3.8.2-1
- Resolves: RHEL-73378, new collcection redhat.sap_install, redhat.sap_infrastructure