Merge pull request #1080 from sap-linuxlab/dev

berndfinger · web-flow · commit 22c8977a61be · 2025-07-18T10:09:05.000+02:00
Merge dev to main for release 1.6.1
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,22 @@ community.sap\_install Release Notes
 
 .. contents:: Topics
 
+v1.6.1
+======
+
+Release Summary
+---------------
+
+A few minor bug fixes
+
+Bugfixes
+--------
+
+- sap_*_preconfigure - Assert the presence of the IBM tools only if necessary (https://github.com/sap-linuxlab/community.sap_install/pull/1078)
+- sap_*_preconfigure - Define needs-restarting also for RHEL 10 (https://github.com/sap-linuxlab/community.sap_install/pull/1071)
+- sap_*_preconfigure - Define needs-restarting also for RHEL 10, assert mode (https://github.com/sap-linuxlab/community.sap_install/pull/1076)
+- sap_ha_pacemaker_cluster - Remove NIC parameter from IPaddr2 resource agents (https://github.com/sap-linuxlab/community.sap_install/pull/1074)
+
 v1.6.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -332,3 +332,12 @@ releases:
         - 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)
+  1.6.1:
+    release_date: '2025-07-17'
+    changes:
+      release_summary: A few minor bug fixes
+      bugfixes:
+        - sap_ha_pacemaker_cluster - Remove NIC parameter from IPaddr2 resource agents (https://github.com/sap-linuxlab/community.sap_install/pull/1074)
+        - sap_*_preconfigure - Assert the presence of the IBM tools only if necessary (https://github.com/sap-linuxlab/community.sap_install/pull/1078)
+        - sap_*_preconfigure - Define needs-restarting also for RHEL 10, assert mode (https://github.com/sap-linuxlab/community.sap_install/pull/1076)
+        - sap_*_preconfigure - Define needs-restarting also for RHEL 10 (https://github.com/sap-linuxlab/community.sap_install/pull/1071)
diff --git a/galaxy.yml b/galaxy.yml
@@ -11,7 +11,7 @@ namespace: community
 name: sap_install
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.6.0
+version: 1.6.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
diff --git a/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml b/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml
@@ -168,7 +168,9 @@
     awk '/Name/{n=$NF}/Version/{v=$NF}/Release/{r=$NF}/Description/{printf ("%s\n", n)}'
   register: __sap_general_preconfigure_register_required_ppc64le_packages_assert
   changed_when: false
-  when: ansible_architecture == "ppc64le"
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
   ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Assert that all required IBM packages are installed
@@ -180,7 +182,9 @@
     - "{{ __sap_general_preconfigure_required_ppc64le }}"
   loop_control:
     loop_var: line_item
-  when: ansible_architecture == "ppc64le"
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
   ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Minimum required package version check
@@ -278,13 +282,11 @@
     __sap_general_preconfigure_fact_needs_restarting_command_assert: "needs-restarting -r"
   when: ansible_distribution_major_version == '7'
 
-- name: "Assert - Set needs-restarting command in case of RHEL 8 or RHEL 9, except RHEL 8.0"
+- name: "Assert - Set needs-restarting command in case of RHEL 8 or greater, except RHEL 8.0"
   ansible.builtin.set_fact:
     __sap_general_preconfigure_fact_needs_restarting_command_assert: "yum needs-restarting -r"
   when:
-    - (ansible_distribution_major_version == '8' or
-         ansible_distribution_major_version == '9'
-      )
+    - ansible_distribution_major_version | int >= 8
     - ansible_distribution_version != '8.0'
 
 - name: "Assert - Set customized needs-restarting command in case of RHEL 8.0"
diff --git a/roles/sap_general_preconfigure/tasks/RedHat/installation.yml b/roles/sap_general_preconfigure/tasks/RedHat/installation.yml
@@ -241,13 +241,11 @@
     __sap_general_preconfigure_fact_needs_restarting_command: "needs-restarting -r"
   when: ansible_distribution_major_version == '7'
 
-- name: "Set needs-restarting command in case of RHEL 8 or RHEL 9, except RHEL 8.0"
+- name: "Set needs-restarting command in case of RHEL 8 or greater, except RHEL 8.0"
   ansible.builtin.set_fact:
     __sap_general_preconfigure_fact_needs_restarting_command: "yum needs-restarting -r"
   when:
-    - (ansible_distribution_major_version == '8' or
-         ansible_distribution_major_version == '9'
-      )
+    - ansible_distribution_major_version | int >= 8
     - ansible_distribution_version != '8.0'
 
 - name: "Set customized needs-restarting command in case of RHEL 8.0"
diff --git a/roles/sap_ha_pacemaker_cluster/README.md b/roles/sap_ha_pacemaker_cluster/README.md
@@ -1098,6 +1098,8 @@ For RHEL System Roles for SAP, or Red Hat Automation Hub, use 'redhat.rhel_syste
 
 OS device name of the network interface to use for the Virtual IP configuration.<br>
 When there is only one interface on the system, its name will be used by default.<br>
+Ensure that same network interface is present on all cluster nodes.<br>
+IPaddr2 resource agent does not require network interface defined (except Google Cloud).<br>
 
 ### sap_ha_pacemaker_cluster_vip_hana_primary_ip_address
 - _Type:_ `string`<br>
diff --git a/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml b/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml
@@ -154,6 +154,8 @@ argument_specs:
         description:
           - OS device name of the network interface to use for the Virtual IP configuration.
           - When there is only one interface on the system, its name will be used by default.
+          - Ensure that same network interface is present on all cluster nodes.
+          - IPaddr2 resource agent does not require network interface defined (except Google Cloud).
 
       sap_ha_pacemaker_cluster_stonith_custom:
         type: list
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_vip_resources_default.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_vip_resources_default.yml
@@ -13,15 +13,22 @@
   ansible.builtin.set_fact:
     __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_vip] }}"
   vars:
+    __ipaddr_ip:
+      - name: ip
+        value: "{{ vip_list_item.value | quote }}"
+    # Create separate list for nic parameter only when it is defined and not empty.
+    __ipaddr_nic:
+      - name: nic
+        value: "{{ sap_ha_pacemaker_cluster_vip_client_interface | d('') }}"
+
     __resource_vip:
       id: "{{ vip_list_item.key }}"
       agent: "{{ __sap_ha_pacemaker_cluster_available_vip_agents['ipaddr'].agent }}"
       instance_attrs:
-        - attrs:
-            - name: ip
-              value: "{{ vip_list_item.value | quote }}"
-            - name: nic
-              value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
+        # Combine both lists if sap_ha_pacemaker_cluster_vip_client_interface is defined and not empty.
+        - attrs: "{{ __ipaddr_ip + __ipaddr_nic
+            if sap_ha_pacemaker_cluster_vip_client_interface is defined and sap_ha_pacemaker_cluster_vip_client_interface | length > 0
+            else __ipaddr_ip }}"
   when:
     - vip_list_item.key not in (__sap_ha_pacemaker_cluster_resource_primitives | map(attribute='id'))
     - sap_ha_pacemaker_cluster_vip_method == 'ipaddr' or
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/include_vars_common.yml b/roles/sap_ha_pacemaker_cluster/tasks/include_vars_common.yml
@@ -8,21 +8,14 @@
   ansible.builtin.setup:
     gather_subset: hardware,interfaces
 
-# Multi-NIC:
-# Find out if there is more than one interface present, this will
-# be used for determining the target NIC for VIP configurations.
-# Assumption: The local loopback "lo" is always in the list.
-- name: "SAP HA Prepare Pacemaker - Set multi-NIC when more than one interface is found"
-  ansible.builtin.set_fact:
-    __sap_ha_pacemaker_cluster_nic_multi_bool: true
-  when:
-    - ansible_interfaces | length > 2
 
-- name: "SAP HA Prepare Pacemaker - Set interface name when only one interface is present"
+# Use default ipv4 interface when one interface is detected.
+# Assumption: The local loopback "lo" is always in the list.
+- name: "SAP HA Prepare Pacemaker - Set network interface name when only one interface is present"
   ansible.builtin.set_fact:
-    sap_ha_pacemaker_cluster_vip_client_interface: "{{ ansible_default_ipv4.interface }}"
+    __sap_ha_pacemaker_cluster_vip_client_interface: "{{ ansible_default_ipv4.interface }}"
   when:
-    - not __sap_ha_pacemaker_cluster_nic_multi_bool
+    - ansible_interfaces | length <= 2
     - sap_ha_pacemaker_cluster_vip_client_interface == ''
 
 
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_aws_ec2_vs.yml b/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_aws_ec2_vs.yml
@@ -58,7 +58,7 @@
             - name: ip
               value: "{{ vip_list_item.value }}"
             - name: interface
-              value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
+              value: "{{ __sap_ha_pacemaker_cluster_vip_client_interface | d(sap_ha_pacemaker_cluster_vip_client_interface) }}"
             - name: routing_table
               value: "{{ sap_ha_pacemaker_cluster_aws_vip_update_rt }}"
   when:
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_gcp_ce_vm.yml b/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_gcp_ce_vm.yml
@@ -22,8 +22,9 @@
               value: "{{ vip_list_item.value }}"
             - name: cidr_netmask
               value: 32
+            # IPaddr2 does not require 'nic' parameter, but GCP documentation includes it.
             - name: nic
-              value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
+              value: "{{ __sap_ha_pacemaker_cluster_vip_client_interface | d(sap_ha_pacemaker_cluster_vip_client_interface) }}"
       operations:
         - action: monitor
           attrs:
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_ibmcloud_powervs.yml b/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_ibmcloud_powervs.yml
@@ -6,17 +6,24 @@
   ansible.builtin.set_fact:
     __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_vip] }}"
   vars:
+    __ipaddr_ip_cidr:
+      - name: ip
+        value: "{{ vip_list_item.value | quote }}"
+      - name: cidr_netmask
+        value: "{{ __sap_ha_pacemaker_cluster_vip_client_interface_subnet_cidr.stdout | int }}"
+    # Create separate list for nic parameter only when it is defined and not empty.
+    __ipaddr_nic:
+      - name: nic
+        value: "{{ sap_ha_pacemaker_cluster_vip_client_interface | d('') }}"
+
     __resource_vip:
       id: "{{ vip_list_item.key }}"
       agent: "{{ __sap_ha_pacemaker_cluster_available_vip_agents[sap_ha_pacemaker_cluster_vip_method].agent }}"
       instance_attrs:
-        - attrs:
-            - name: ip
-              value: "{{ vip_list_item.value }}"
-            - name: cidr_netmask
-              value: "{{ __sap_ha_pacemaker_cluster_vip_client_interface_subnet_cidr.stdout | int }}"
-            - name: nic
-              value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
+        # Combine both lists if sap_ha_pacemaker_cluster_vip_client_interface is defined and not empty.
+        - attrs: "{{ __ipaddr_ip_cidr + __ipaddr_nic
+            if sap_ha_pacemaker_cluster_vip_client_interface is defined and sap_ha_pacemaker_cluster_vip_client_interface | length > 0
+            else __ipaddr_ip_cidr }}"
   when:
     - vip_list_item.key not in (__sap_ha_pacemaker_cluster_resource_primitives | map(attribute='id'))
     - sap_ha_pacemaker_cluster_vip_method == 'ipaddr_custom' or
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_hyp_ibmpower_vm.yml b/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_hyp_ibmpower_vm.yml
@@ -6,15 +6,22 @@
   ansible.builtin.set_fact:
     __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_vip] }}"
   vars:
+    __ipaddr_ip:
+      - name: ip
+        value: "{{ vip_list_item.value | quote }}"
+    # Create separate list for nic parameter only when it is defined and not empty.
+    __ipaddr_nic:
+      - name: nic
+        value: "{{ sap_ha_pacemaker_cluster_vip_client_interface | d('') }}"
+
     __resource_vip:
       id: "{{ vip_list_item.key }}"
       agent: "{{ __sap_ha_pacemaker_cluster_available_vip_agents[sap_ha_pacemaker_cluster_vip_method].agent }}"
       instance_attrs:
-        - attrs:
-            - name: ip
-              value: "{{ vip_list_item.value }}"
-            - name: nic
-              value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
+        # Combine both lists if sap_ha_pacemaker_cluster_vip_client_interface is defined and not empty.
+        - attrs: "{{ __ipaddr_ip + __ipaddr_nic
+            if sap_ha_pacemaker_cluster_vip_client_interface is defined and sap_ha_pacemaker_cluster_vip_client_interface | length > 0
+            else __ipaddr_ip }}"
   when:
     - vip_list_item.key not in (__sap_ha_pacemaker_cluster_resource_primitives | map(attribute='id'))
     - (sap_ha_pacemaker_cluster_vip_method == 'ipaddr') or
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/platform/register_sysinfo_cloud_ibmcloud_powervs.yml b/roles/sap_ha_pacemaker_cluster/tasks/platform/register_sysinfo_cloud_ibmcloud_powervs.yml
@@ -22,9 +22,11 @@
 - name: "SAP HA Prepare Pacemaker - IBM Cloud PowerVS - Calculate network interface subnet CIDR"
   ansible.builtin.shell: |
     set -o pipefail && ipcalc --prefix \
-     {{ ansible_facts[sap_ha_pacemaker_cluster_vip_client_interface].ipv4.network
-     + '/' + ansible_facts[sap_ha_pacemaker_cluster_vip_client_interface].ipv4.netmask }} \
+     {{ ansible_facts[__interface].ipv4.network
+     + '/' + ansible_facts[__interface].ipv4.netmask }} \
      | sed 's|PREFIX=||'
   register: __sap_ha_pacemaker_cluster_vip_client_interface_subnet_cidr
   changed_when: false
   check_mode: false
+  vars:
+    __interface: "{{ __sap_ha_pacemaker_cluster_vip_client_interface | d(sap_ha_pacemaker_cluster_vip_client_interface) }}"
diff --git a/roles/sap_ha_pacemaker_cluster/vars/main.yml b/roles/sap_ha_pacemaker_cluster/vars/main.yml
@@ -28,10 +28,6 @@ __sap_ha_pacemaker_cluster_required_facts:
 #  - virtualization_role # subset: virtual
 #  - virtualization_type # subset: virtual
 
-# By default assume non-multi-NIC configuration.
-# This is automatically adjusted during preparation tasks.
-__sap_ha_pacemaker_cluster_nic_multi_bool: false
-
 # By default use the construction of IPaddr2 VIP resources
 # Platforms define different methods out of optional agents, as applicable.
 sap_ha_pacemaker_cluster_vip_method: ipaddr
diff --git a/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml b/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml
@@ -89,17 +89,16 @@
 ### # /opt/ibm/lop/configure
 ### # yum -y install ibm-power-managed-rhel7
 ###
-# Reasons for noqa:
-# command-instead-of-module: I need to examine the output of the yum info command.
-# risky-shell-pipe: If a package is not installed, the shell command will fail. But I want the command to
-#   succeed so that the awk command can examine the result.
-- name: Get install status of required IBM packages # noqa command-instead-of-module risky-shell-pipe
+- name: Get install status of required IBM packages
   ansible.builtin.shell: |
-    yum info installed {{ __sap_hana_preconfigure_required_ppc64le | map('quote') | join(' ') }} |
+    set -o pipefail && yum info installed {{ __sap_hana_preconfigure_required_ppc64le | map('quote') | join(' ') }} |
     awk '/Name/{n=$NF}/Version/{v=$NF}/Release/{r=$NF}/Description/{printf ("%s\n", n)}'
   register: __sap_hana_preconfigure_register_required_ppc64le_packages_assert
-  changed_when: no
-  when: ansible_architecture == "ppc64le"
+  changed_when: false
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
+  ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Assert that all required IBM packages are installed
   ansible.builtin.assert:
@@ -110,7 +109,9 @@
     - "{{ __sap_hana_preconfigure_required_ppc64le }}"
   loop_control:
     loop_var: line_item
-  when: ansible_architecture == "ppc64le"
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
   ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Minimum required package version check
@@ -207,17 +208,13 @@
   ansible.builtin.set_fact:
     __sap_hana_preconfigure_fact_needs_restarting_command_assert: "needs-restarting -r"
   when:
-    - ansible_os_family == 'RedHat'
     - ansible_distribution_major_version == '7'
 
-- name: "Assert - Set needs-restarting command in case of RHEL 8 or RHEL 9, except RHEL 8.0"
+- name: "Assert - Set needs-restarting command in case of RHEL 8 or greater, except RHEL 8.0"
   ansible.builtin.set_fact:
     __sap_hana_preconfigure_fact_needs_restarting_command_assert: "yum needs-restarting -r"
   when:
-    - ansible_os_family == 'RedHat'
-    - (ansible_distribution_major_version == '8' or
-         ansible_distribution_major_version == '9'
-      )
+    - ansible_distribution_major_version | int >= 8
     - ansible_distribution_version != '8.0'
 
 - name: "Assert - Set customized needs-restarting command in case of RHEL 8.0"
@@ -233,7 +230,7 @@
     var: __sap_hana_preconfigure_fact_needs_restarting_command_assert
 
 # Reason for noqa: The command to be executed might contain pipes
-- name: Assert - Determine if system needs to be restarted # noqa command-instead-of-shell
+- name: Assert - Determine if the system needs to be restarted # noqa command-instead-of-shell
   ansible.builtin.shell: "{{ __sap_hana_preconfigure_fact_needs_restarting_command_assert }}"
   register: __sap_hana_preconfigure_register_needs_restarting_assert
   changed_when: false
diff --git a/roles/sap_hana_preconfigure/tasks/RedHat/installation.yml b/roles/sap_hana_preconfigure/tasks/RedHat/installation.yml
@@ -202,32 +202,27 @@
   ansible.builtin.set_fact:
     __sap_hana_preconfigure_fact_needs_restarting_command: "needs-restarting -r"
   when:
-    - ansible_os_family == 'RedHat'
     - ansible_distribution_major_version == '7'
 
-- name: "Set needs-restarting command in case of RHEL 8 or RHEL 9, except RHEL 8.0"
+- name: "Set needs-restarting command in case of RHEL 8 or greater, except RHEL 8.0"
   ansible.builtin.set_fact:
     __sap_hana_preconfigure_fact_needs_restarting_command: "yum needs-restarting -r"
   when:
-    - ansible_os_family == 'RedHat'
-    - (ansible_distribution_major_version == '8' or
-         ansible_distribution_major_version == '9'
-      )
+    - ansible_distribution_major_version | int >= 8
     - ansible_distribution_version != '8.0'
 
 - name: "Set customized needs-restarting command in case of RHEL 8.0"
   ansible.builtin.set_fact:
     __sap_hana_preconfigure_fact_needs_restarting_command: "_IKRNL=$(rpm -q --last kernel | awk 'NR==1{sub(/kernel-/,\"\"); print $1}'); _CKRNL=$(uname -r); if [ ${_IKRNL} != ${_CKRNL} ]; then exit 1; else exit 0; fi"
   when:
-    - ansible_os_family == 'RedHat'
     - ansible_distribution_version == '8.0'
 
 - name: Display the command for checking a reboot requirement
   ansible.builtin.debug:
     var: __sap_hana_preconfigure_fact_needs_restarting_command
 
 # Reason for noqa: The command to be executed might contain pipes
-- name: Determine if system needs to be restarted # noqa command-instead-of-shell
+- name: Determine if the system needs to be restarted # noqa command-instead-of-shell
   ansible.builtin.shell: "{{ __sap_hana_preconfigure_fact_needs_restarting_command }}"
   register: __sap_hana_preconfigure_register_needs_restarting
   ignore_errors: true
diff --git a/roles/sap_install_media_detect/files/tmp/sapfile b/roles/sap_install_media_detect/files/tmp/sapfile
