Merge pull request #1065 from sap-linuxlab/dev

Merge dev to main for release 1.6.0

Author: berndfinger

CHANGELOG.rst

@@ -4,6 +4,43 @@ community.sap\_install Release Notes
 
 .. contents:: Topics
 
+v1.6.0
+======
+
+Release Summary
+---------------
+
+Various improvements and bug fixes
+
+Minor Changes
+-------------
+
+- New Feature - sap_anydb_install_oracle - Add handling of OS specific vars (https://github.com/sap-linuxlab/community.sap_install/pull/1033)
+- New Feature - sap_ha_pacemaker_cluster - SLES16 support, new vars for ha_cluster for corosync and zypper patterns (https://github.com/sap-linuxlab/community.sap_install/pull/1056)
+- New Feature - sap_storage_setup - Allow /software NFS mount (https://github.com/sap-linuxlab/community.sap_install/pull/1029)
+- sap_*_preconfigure - Add missing RHEL 10.x vars (https://github.com/sap-linuxlab/community.sap_install/pull/1059)
+- sap_general_preconfigure - Modify the kernel command line for SELinux also for RHEL 10 (https://github.com/sap-linuxlab/community.sap_install/pull/1036)
+- sap_general_preconfigure - Use the correct sap.conf file for RHEL 10 (https://github.com/sap-linuxlab/community.sap_install/pull/1022)
+- sap_ha_pacemaker_cluster/SUSE - SAP HANA scaleup post steps updated (https://github.com/sap-linuxlab/community.sap_install/pull/1061)
+- sap_hana_install - Add opt-out for setting sidadm to noexpire (https://github.com/sap-linuxlab/community.sap_install/pull/1016)
+- sap_swpm - Add opt-out for setting sidadm to noexpire (https://github.com/sap-linuxlab/community.sap_install/pull/1018)
+
+Bugfixes
+--------
+
+- Collection - fix documentation link in galaxy.yml (https://github.com/sap-linuxlab/community.sap_install/pull/1009)
+- sap_*_preconfigure - Make SELinux booleans persistent (https://github.com/sap-linuxlab/community.sap_install/pull/1013)
+- sap_*_preconfigure/SUSE - Add retry attempts to zypper pattern installation  (https://github.com/sap-linuxlab/community.sap_install/pull/1032)
+- sap_*_preconfigure/SUSE - Update SLES16 pattern names and add packages for hardened images (https://github.com/sap-linuxlab/community.sap_install/pull/1057)
+- sap_ha_pacemaker_cluster/SUSE - Remove python3-rpm dependency in pre_steps_hana (https://github.com/sap-linuxlab/community.sap_install/pull/1028)
+- sap_hana_install - update README.md with Local Secure Store (LSS) installation details and examples (https://github.com/sap-linuxlab/community.sap_install/pull/1008)
+- sap_maintain_etc_hosts - Resolve situation with empty domain, but not undefined (https://github.com/sap-linuxlab/community.sap_install/pull/1044)
+- sap_swpm - Ensure sap_swpm_product_catalog_id is a string (https://github.com/sap-linuxlab/community.sap_install/pull/1035)
+- sap_swpm - Fix TEMP handling (https://github.com/sap-linuxlab/community.sap_install/pull/1019)
+- sap_swpm - Remove selinux role dependency from README.md (https://github.com/sap-linuxlab/community.sap_install/pull/1012)
+- sap_swpm - Require inifile.params only on the managed node when reusing an existing inifile.params. (https://github.com/sap-linuxlab/community.sap_install/pull/1024)
+- sap_swpm - Sanitize hostname length (https://github.com/sap-linuxlab/community.sap_install/pull/1042)
+
 v1.5.3
 ======
 

changelogs/changelog.yaml

@@ -305,3 +305,30 @@ releases:
         - sap_swpm - Fix link in README.md (https://github.com/sap-linuxlab/community.sap_install/pull/970)
         - sap_swpm - removed duplicates from credentials_hana section (https://github.com/sap-linuxlab/community.sap_install/pull/982)
         - sap_swpm - remove duplicate section credentials_anydb_ibmdb2 (https://github.com/sap-linuxlab/community.sap_install/pull/995)
+  1.6.0:
+    release_date: '2025-07-03'
+    changes:
+      release_summary: Various improvements and bug fixes
+      minor_changes:
+        - New Feature - sap_anydb_install_oracle - Add handling of OS specific vars (https://github.com/sap-linuxlab/community.sap_install/pull/1033)
+        - New Feature - sap_ha_pacemaker_cluster - SLES16 support, new vars for ha_cluster for corosync and zypper patterns (https://github.com/sap-linuxlab/community.sap_install/pull/1056)
+        - New Feature - sap_storage_setup - Allow /software NFS mount (https://github.com/sap-linuxlab/community.sap_install/pull/1029)
+        - sap_*_preconfigure - Add missing RHEL 10.x vars (https://github.com/sap-linuxlab/community.sap_install/pull/1059)
+        - sap_general_preconfigure - Modify the kernel command line for SELinux also for RHEL 10 (https://github.com/sap-linuxlab/community.sap_install/pull/1036)
+        - sap_general_preconfigure - Use the correct sap.conf file for RHEL 10 (https://github.com/sap-linuxlab/community.sap_install/pull/1022)
+        - sap_hana_install - Add opt-out for setting sidadm to noexpire (https://github.com/sap-linuxlab/community.sap_install/pull/1016)
+        - sap_swpm - Add opt-out for setting sidadm to noexpire (https://github.com/sap-linuxlab/community.sap_install/pull/1018)
+        - sap_ha_pacemaker_cluster/SUSE - SAP HANA scaleup post steps updated (https://github.com/sap-linuxlab/community.sap_install/pull/1061)
+      bugfixes:
+        - Collection - fix documentation link in galaxy.yml (https://github.com/sap-linuxlab/community.sap_install/pull/1009)
+        - sap_maintain_etc_hosts - Resolve situation with empty domain, but not undefined (https://github.com/sap-linuxlab/community.sap_install/pull/1044)
+        - sap_*_preconfigure - Make SELinux booleans persistent (https://github.com/sap-linuxlab/community.sap_install/pull/1013)
+        - sap_*_preconfigure/SUSE - Update SLES16 pattern names and add packages for hardened images (https://github.com/sap-linuxlab/community.sap_install/pull/1057)
+        - sap_*_preconfigure/SUSE - Add retry attempts to zypper pattern installation  (https://github.com/sap-linuxlab/community.sap_install/pull/1032)
+        - sap_hana_install - update README.md with Local Secure Store (LSS) installation details and examples (https://github.com/sap-linuxlab/community.sap_install/pull/1008)
+        - sap_swpm - Sanitize hostname length (https://github.com/sap-linuxlab/community.sap_install/pull/1042)
+        - sap_swpm - Ensure sap_swpm_product_catalog_id is a string (https://github.com/sap-linuxlab/community.sap_install/pull/1035)
+        - sap_swpm - Require inifile.params only on the managed node when reusing an existing inifile.params. (https://github.com/sap-linuxlab/community.sap_install/pull/1024)
+        - sap_swpm - Fix TEMP handling (https://github.com/sap-linuxlab/community.sap_install/pull/1019)
+        - sap_swpm - Remove selinux role dependency from README.md (https://github.com/sap-linuxlab/community.sap_install/pull/1012)
+        - sap_ha_pacemaker_cluster/SUSE - Remove python3-rpm dependency in pre_steps_hana (https://github.com/sap-linuxlab/community.sap_install/pull/1028)

galaxy.yml

@@ -11,7 +11,7 @@ namespace: community
 name: sap_install
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.5.3
+version: 1.6.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -58,7 +58,7 @@ dependencies: {}
 repository: https://github.com/sap-linuxlab/community.sap_install
 
 # The URL to any online docs
-documentation: https://github.com/sap-linuxlab/sap-linuxlab.github.io/blob/master/README.md
+documentation: https://github.com/sap-linuxlab/community.sap_install/blob/main/README.md
 
 # The URL to the homepage of the collection/project
 homepage: https://sap-linuxlab.github.io

roles/sap_anydb_install_oracle/tasks/main.yml

@@ -1,6 +1,35 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 
+# Example of files loading order:
+# 1. Suse.yml / RedHat.yml - Specific to OS family.
+# 2. SLES_15.yml / RedHat_9.yml - Specific to distribution (SLES, SLES_SAP or RedHat) and major release.
+# 3. SLES_15.6.yml / RedHat_9.2 - Specific to distribution (SLES, SLES_SAP or RedHat) and minor release.
+# 4. SLES_SAP_15.yml - Specific to distribution SLES_SAP and major release.
+# 5. SLES_SAP_15.6.yml - Specific to distribution SLES_SAP and minor release.
+- name: Include OS specific vars
+  ansible.builtin.include_vars: "{{ __vars_file }}"
+  loop: "{{ __var_files }}"
+  vars:
+    __vars_file: "{{ role_path }}/vars/{{ item }}"
+    __distribution_major: "{{ ansible_distribution ~ '_' ~ ansible_distribution_major_version }}"
+    __distribution_minor: "{{ ansible_distribution ~ '_' ~ ansible_distribution_version }}"
+    # Enables loading of shared vars between SLES and SLES_SAP
+    __distribution_major_split: "{{ ansible_distribution.split('_')[0] ~ '_' ~ ansible_distribution_major_version }}"
+    __distribution_minor_split: "{{ ansible_distribution.split('_')[0] ~ '_' ~ ansible_distribution_version }}"
+    __var_files: >-
+      {{
+        [
+          ansible_os_family ~ '.yml',
+          (ansible_distribution ~ '.yml') if ansible_distribution != ansible_os_family else None,
+          (__distribution_major_split ~ '.yml') if __distribution_major_split != __distribution_major else None,
+          (__distribution_minor_split ~ '.yml') if __distribution_minor_split != __distribution_minor else None,
+          __distribution_major ~ '.yml',
+          __distribution_minor ~ '.yml'
+        ] | select('defined') | select('string') | list
+      }}
+  when: __vars_file is file
+
 - name: Oracle DB - Pre-installation
   ansible.builtin.include_tasks: "oracledb_install_pre.yml"
 

roles/sap_anydb_install_oracle/tasks/oracledb_install_pre.yml

@@ -1,46 +1,33 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 
-# See further:
-## oracle-database-preinstall-12cr1.rpm
-## oracle-database-preinstall-12cr2.rpm
-## oracle-database-preinstall-19c.rpm >> https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64/getPackage/oracle-database-preinstall-19c-1.0-2.el8.x86_64.rpm
+# SUSE Specific - zypper pattern installation
+# Pattern installation will run only if pattern is not installed
+# This ensures that command module shows correct changed status
+- name: Query installed zypper patterns
+  ansible.builtin.command:
+    cmd: zypper patterns --installed-only
+  register: __sap_anydb_install_oracle_register_patterns
+  changed_when: false
+  ignore_errors: true
+  when: ansible_os_family == 'Suse'
+
+- name: Ensure that the required zypper patterns are installed
+  ansible.builtin.command:
+    cmd: zypper install -y -t pattern {{ item }}
+  loop: "{{ __sap_anydb_install_oracle_patterns }}"
+  when:
+    - ansible_os_family == 'Suse'
+    - item not in __sap_anydb_install_oracle_register_patterns.stdout
+  changed_when: item not in __sap_anydb_install_oracle_register_patterns.stdout
+
+
 - name: Install C Shell (CSH), Korn Shell (KSH) and other dependencies for Oracle DB
   ansible.builtin.package:
-    name:
-    - csh
-    - ksh
-    - mksh
-    - bc
-    - bind-utils
-    - gcc
-    - gcc-c++
-    - glibc-devel
-    - libcap
-    - libaio
-    - libaio-devel
-    - libgcc
-    - libstdc++
-    - libstdc++-devel
-    - make
-    - psmisc
-    - rdma-core-devel
-    - smartmontools
-    - sysstat
-    - unzip
-    - xorg-x11-utils
-    - xorg-x11-xauth
-    - unixODBC
-    - unixODBC-devel
-    - libnsl
+    name: "{{ __sap_anydb_install_oracle_packages | d([]) }}"
     state: present
   notify: __sap_anydb_install_oracle_reboot_handler
 
-# Removed Packages from RHEL 8.x
-# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#removed-packages_changes-to-packages
-#    - compat-libcap1
-#    - compat-libstdc++-33
-
 
 - name: Oracle DB - Create Linux User Groups
   become_user: root

roles/sap_anydb_install_oracle/vars/RedHat.yml

@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: Apache-2.0
+---
+
+# List of required packages to install
+__sap_anydb_install_oracle_packages:
+  - csh
+  - ksh
+  - mksh
+  - bc
+  - bind-utils
+  - gcc
+  - gcc-c++
+  - glibc-devel
+  - libcap
+  - libaio
+  - libaio-devel
+  - libgcc
+  - libstdc++
+  - libstdc++-devel
+  - make
+  - psmisc
+  - rdma-core-devel
+  - smartmontools
+  - sysstat
+  - unzip
+  - xorg-x11-utils
+  - xorg-x11-xauth
+  - unixODBC
+  - unixODBC-devel
+  - libnsl
+
+# See further:
+## oracle-database-preinstall-12cr1.rpm
+## oracle-database-preinstall-12cr2.rpm
+## oracle-database-preinstall-19c.rpm >> https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64/getPackage/oracle-database-preinstall-19c-1.0-2.el8.x86_64.rpm
+
+# Removed Packages from RHEL 8.x
+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#removed-packages_changes-to-packages
+#    - compat-libcap1
+#    - compat-libstdc++-33

roles/sap_anydb_install_oracle/vars/Suse.yml

@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: Apache-2.0
+---
+
+# List of required packages to install
+__sap_anydb_install_oracle_packages:
+    - tcsh
+    - ksh
+    - mksh
+    - bc
+    - bind-utils
+    - gcc
+    - gcc-c++
+    - glibc-devel
+    - libcap2
+    - libaio
+    - libaio-devel
+    - libgcc_s1
+    - libstdc++6
+    - libstdc++-devel
+    - make
+    - psmisc
+    - rdma-core-devel
+    - smartmontools
+    - sysstat
+    - unzip
+    - unixODBC
+    - unixODBC-devel
+    - libnsl2
+
+# List of required zypper patterns
+# NOTE: Pattern oracle_server (orarun package) is not compatible with saptune NETWEAVER,
+# because SUSE does not support Single-host SAP System with Oracle database.
+__sap_anydb_install_oracle_patterns:
+  - oracle_server

roles/sap_general_preconfigure/files/etc/tmpfiles.d/sap.conf renamed to roles/sap_general_preconfigure/files/etc/tmpfiles.d/sap_RedHat_7_8.conf

@@ -43,12 +43,10 @@
   changed_when: false
   when: __sap_general_preconfigure_fact_selinux_mode != sap_general_preconfigure_selinux_state
 
-- name: Set or unset SELinux kernel parameter, RHEL 8 and RHEL 9
+- name: Set or unset SELinux kernel parameter, RHEL >= 8
   when:
     - ansible_os_family == 'RedHat'
-    - ( ansible_distribution_major_version == '8' or
-        ansible_distribution_major_version == '9'
-      )
+    - ansible_distribution_major_version | int >= 8
   block:
 
     - name: SELinux - Examine grub entries
@@ -57,7 +55,7 @@
       check_mode: false
       changed_when: false
 
-    - name: Disable SELinux on the kernel command line, RHEL 8 and RHEL 9
+    - name: Disable SELinux on the kernel command line, RHEL >= 8
       when:
         - sap_general_preconfigure_selinux_state == 'disabled'
         - __sap_general_preconfigure_register_grubby_info_all_selinux.stdout.split(' ').1 !=
@@ -67,7 +65,7 @@
 # If the number of grub entries for args is different from the number of grub entries with "selinux=0",
 # we know that at least one grub entry is missing "selinux=0", so we make sure that all grub entries
 # contain "selinux=0"
-        - name: Disable SELinux also on the kernel command line, RHEL 8 and RHEL 9
+        - name: Disable SELinux also on the kernel command line, RHEL >= 8
           ansible.builtin.command: grubby --args="selinux=0" --update-kernel=ALL
           notify: __sap_general_preconfigure_reboot_handler
           changed_when: true
@@ -77,7 +75,7 @@
           ansible.builtin.set_fact:
             sap_general_preconfigure_fact_reboot_required: true
 
-    - name: Enable SELinux on the kernel command line, RHEL 8 and RHEL 9
+    - name: Enable SELinux on the kernel command line, RHEL >= 8
       when:
         - sap_general_preconfigure_selinux_state == 'enforcing' or
           sap_general_preconfigure_selinux_state == 'permissive'
@@ -86,7 +84,7 @@
 
 # If the number of grub entries for args with "selinux=0" is not 0, we know that there is at least
 # one grub entry with "selinux=0", so we make sure that no grub entry contains "selinux=0"
-        - name: Make sure SELinux is not disabled on the kernel command line, RHEL 8 and RHEL 9
+        - name: Make sure SELinux is not disabled on the kernel command line, RHEL >= 8
           ansible.builtin.command: grubby --remove-args="selinux" --update-kernel=ALL
           notify: __sap_general_preconfigure_reboot_handler
           changed_when: true
@@ -112,7 +110,7 @@
     name: '{{ sap_general_preconfigure_system_roles_collection }}.selinux'
   vars:
     selinux_booleans:
-      - { name: 'selinuxuser_execmod', state: 'on' }
+      - { name: 'selinuxuser_execmod', state: 'on', persistent: 'true' }
     selinux_fcontexts:
       - "{{ sap_general_preconfigure_fact_targets_setypes }}"
     selinux_restore_dirs: