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

- sap_hana_preconfigure: using wrong variable name

Browse Source 
- do not attempt to enable HANA repos for s390x
- sap_general_preconfigure: fix variable inclusion for RHEL minor releases
- sap_hana_preconfigure: Add vars for RHEL 9.1 managed nodes
- sap_hana_preconfigure: Fix issue #154
Related: #2065407
This commit is contained in:
Than Ngo 2022-06-08 19:21:42 +02:00
parent a26b8ff5a0
commit e51fb7cace
4 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,9 +59,12 @@ Source5: galaxy.yml
# patches 50-99 for sap-hana-preconfigure
Patch50: sap-hana-preconfigure-md2html-error.patch
Patch51: sap_hana_preconfigure-fix-issue-#153.patch
Patch52: sap_hana_preconfigure-1bed9bd31df258d57308f7fcffadd433d97cc9d7.patch
Patch53: sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch
# patches 100-149 for sap-netweaver-preconfigur
# patches 150-199 for sap_general_preconfigure
Patch150: community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch
Patch151: sap_general_preconfigure-d93938a8163abf00feb8f5747fdafe9a2e4d2d97.patch
BuildArch: noarch
@ -139,9 +142,12 @@ sed -i -e "s|version: 1.0.0|version: %{collection_version}|" galaxy.yml
pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_hana_preconfigure
%patch50 -p1
%patch51 -p1
%patch52 -p3
%patch53 -p1
popd
pushd %{github_repo_sap_install}-%{commit_id_sap_install}/
%patch150 -p1
%patch151 -p1
popd
pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/
@ -248,7 +254,12 @@ popd
%changelog
* Wed Jun 08 2022 Than Ngo <than@redhat.com> - 3.2.0-4
- Related: #2065407, __sap_hana_preconfigure_uefi_boot_dir undefined variable, do not attempt to enable HANA repos for s390x
- sap_hana_preconfigure: using wrong variable name
- do not attempt to enable HANA repos for s390x
- sap_general_preconfigure: fix variable inclusion for RHEL minor releases
- sap_hana_preconfigure: Add vars for RHEL 9.1 managed nodes
- sap_hana_preconfigure: Fix issue #154
Related: #2065407
* Sun Mar 13 2022 Than Ngo <than@redhat.com> - 3.2.0-3
- Resolves: #2065407, new rebase

14
sap_general_preconfigure-d93938a8163abf00feb8f5747fdafe9a2e4d2d97.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml.me community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml
--- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml.me 2022-06-08 19:00:38.776364517 +0200
+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml 2022-06-08 19:03:14.966871047 +0200
@@ -7,8 +7,8 @@
- name: Include OS specific vars, specific
include_vars: '{{ item }}'
with_first_found:
- - '{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml'
- - '{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml'
+ - '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_version }}.yml'
+ - '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_major_version }}.yml'
- '{{ ansible_os_family }}.yml'
- name: Rename user sap_preconfigure variables if found

43
sap_hana_preconfigure-1bed9bd31df258d57308f7fcffadd433d97cc9d7.patch Normal file
View File

@ -0,0 +1,43 @@
commit 1bed9bd31df258d57308f7fcffadd433d97cc9d7
Author: Bernd Finger <>
Date: Wed Jun 8 17:51:30 2022 +0200
sap_hana_preconfigure: Add vars for RHEL 9.1 managed nodes
The minimum RHEL 9 kernel for RHEL 9.0 is now set to be identical to the
GA kernel.
diff --git a/roles/sap_hana_preconfigure/vars/RedHat_9.yml b/roles/sap_hana_preconfigure/vars/RedHat_9.yml
index 0be479b..d3440e5 100644
--- a/roles/sap_hana_preconfigure/vars/RedHat_9.yml
+++ b/roles/sap_hana_preconfigure/vars/RedHat_9.yml
@@ -15,6 +15,16 @@ __sap_hana_preconfigure_req_repos_redhat_9_0_ppc64le:
- "rhel-9-for-ppc64le-appstream-e4s-rpms"
- "rhel-9-for-ppc64le-sap-solutions-e4s-rpms"
+__sap_hana_preconfigure_req_repos_redhat_9_1_x86_64:
+ - "rhel-9-for-x86_64-baseos-rpms"
+ - "rhel-9-for-x86_64-appstream-rpms"
+ - "rhel-9-for-x86_64-sap-solutions-rpms"
+
+__sap_hana_preconfigure_req_repos_redhat_9_1_ppc64le:
+ - "rhel-9-for-ppc64le-baseos-rpms"
+ - "rhel-9-for-ppc64le-appstream-rpms"
+ - "rhel-9-for-ppc64le-sap-solutions-rpms"
+
# required SAP notes for RHEL 9:
__sap_hana_preconfigure_sapnotes_versions_x86_64:
- { number: '2777782', version: '22' }
@@ -36,10 +46,10 @@ __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars','__sap_hana_preconf
# Minimum required package levels for RHEL 9.0:
__sap_hana_preconfigure_min_packages_9_0_x86_64:
- - [ 'kernel', '5.11.0-1.el9' ]
+ - [ 'kernel', '5.14.0-70.13.1.el9_0' ]
__sap_hana_preconfigure_min_packages_9_0_ppc64le:
- - [ 'kernel', '5.11.0-2.el9' ]
+ - [ 'kernel', '5.14.0-70.13.1.el9_0' ]
__sap_hana_preconfigure_min_packages_9_1_x86_64:

18
sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch Normal file
View File

@ -0,0 +1,18 @@
diff -up sap_hana_preconfigure/handlers/main.yml.me sap_hana_preconfigure/handlers/main.yml
--- sap_hana_preconfigure/handlers/main.yml.me 2022-06-08 18:52:49.832790508 +0200
+++ sap_hana_preconfigure/handlers/main.yml 2022-06-08 18:53:28.792668038 +0200
@@ -37,12 +37,14 @@
- name: "Set the grub.cfg location RHEL"
set_fact:
__sap_hana_preconfigure_uefi_boot_dir: /boot/efi/EFI/redhat/grub.cfg
+ listen: __sap_hana_preconfigure_regenerate_grub2_conf_handler
when:
- ansible_distribution == 'RedHat'
- name: "Set the grub.cfg location SLES"
set_fact:
__sap_hana_preconfigure_uefi_boot_dir: /boot/efi/EFI/BOOT/grub.cfg
+ listen: __sap_hana_preconfigure_regenerate_grub2_conf_handler
when:
- ansible_distribution == 'SLES' or ansible_distribution == 'SLES_SAP'