Merge pull request #771 from sap-linuxlab/dev

collection: merge dev to main for release 1.4.1

Author: berndfinger

.github/workflows/ansible-test-sanity.yml

@@ -5,9 +5,10 @@
 name: ansible-test sanity of the collection
 
 on:
-  schedule:
-    - cron: '31 12 * * 1'
-
+  pull_request:
+    branches:
+      - main
+      - dev
   workflow_dispatch:
 
 jobs:

.github/workflows/codespell.yml

@@ -1,3 +1,5 @@
+---
+
 name: CodeSpell
 
 on:

CHANGELOG.rst

@@ -5,6 +5,51 @@ community.sap_install Release Notes
 .. contents:: Topics
 
 
+v1.4.1
+======
+
+Release Summary
+---------------
+
+| Release Date: 2024-06-21
+| feat: sap_hana_install: add compatibility for fapolicyd
+| feat: sap_swpm: append generate options for s4hana java
+| feat: sap_ha_pacemaker_cluster: upgrade to ha_cluster Ansible Role with SLES compatibility
+| feat: sap_ha_pacemaker_cluster: compatibility enhancement for SLES
+| feat: sap_ha_pacemaker_cluster: improved handling of custom SAP HANA srHooks
+| feat: sap_ha_pacemaker_cluster: handling for future merged Resource Agent package (SAPHanaSR-angi)
+| feat: sap_ha_pacemaker_cluster: graceful SAP HANA start after PCMK Cluster start
+| feat: sap_ha_pacemaker_cluster: ASCS ERS Simple Mount
+| collection: add sample AAS installation var file
+| collection: fix ansible-test sanity errors
+| collection: for package_facts Ansible Module add python3-rpm requirement for SLES
+| collection: use -i instead of -l test scripts
+| sap_*_preconfigure: disable and stop sapconf when saptune run
+| sap_general_preconfigure: fix /etc/hosts check in assert mode
+| sap_general_preconfigure: revert to awk for asserting /etc/hosts
+| sap_general_preconfigure: use tags for limiting the role scope
+| sap_general_preconfigure: use the package module in most cases
+| sap_general_preconfigure: use the role sap_maintain_etc_hosts - RHEL systems
+| sap_hana_preconfigure: move handlers to the correct location
+| sap_hana_preconfigure: catch SELinux disabled
+| sap_hana_preconfigure: update kernel parameters for SLES
+| sap_netweaver_preconfigure: sync with SAP note 3119751 v.13 for RHEL
+| sap_anydb_install_oracle: fix temp directory removal
+| sap_ha_pacemaker_cluster: use expect Ansible Module and add python3-pip requirement
+| sap_ha_pacemaker_cluster: add retry for Azure Files (NFS) to avoid locks
+| sap_ha_pacemaker_cluster: variable changes for different os and platforms
+| sap_ha_pacemaker_cluster: fix pcs resource restart
+| sap_hana_install: update documentation for parameter sap_hana_install_force
+| sap_install_media_detect: detection of SAP Kernel Part I only
+| sap_install_media_detect: duplicate SAR file handling for SAP Kernel, IGS, WebDisp
+| sap_install_media_detect: directory handling fix for SAP SWPM
+| sap_maintain_etc_hosts: fix wrong assert messages
+| sap_maintain_etc_hosts: remove use ansible.utils.ip
+| sap_storage_setup: fix for TB disks
+| sap_swpm: directory handling fix for SAP SWPM
+| sap_swpm: align execution and monitoring timeouts to 24hrs (86400s)
+| sap_swpm: optionally skip setting file permissions
+
 v1.4.0
 ======
 

changelogs/changelog.yaml

@@ -165,3 +165,46 @@ releases:
         | sap_anydb_install_oracle: Feature add for Oracle DB install with patch
         '
     release_date: '2024-02-02'
+  1.4.1:
+    changes:
+      release_summary: '| Release Date: 2024-06-20
+
+        | feat: sap_hana_install: add compatibility for fapolicyd
+        | feat: sap_swpm: append generate options for s4hana java
+        | feat: sap_ha_pacemaker_cluster: upgrade to ha_cluster Ansible Role with SLES compatibility
+        | feat: sap_ha_pacemaker_cluster: compatibility enhancement for SLES
+        | feat: sap_ha_pacemaker_cluster: improved handling of custom SAP HANA srHooks
+        | feat: sap_ha_pacemaker_cluster: handling for future merged Resource Agent package (SAPHanaSR-angi)
+        | feat: sap_ha_pacemaker_cluster: graceful SAP HANA start after PCMK Cluster start
+        | feat: sap_ha_pacemaker_cluster: ASCS ERS Simple Mount
+        | collection: add sample AAS installation var file
+        | collection: fix ansible-test sanity errors
+        | collection: for package_facts Ansible Module add python3-rpm requirement for SLES
+        | collection: use -i instead of -l test scripts
+        | sap_*_preconfigure: disable and stop sapconf when saptune run
+        | sap_general_preconfigure: fix /etc/hosts check in assert mode
+        | sap_general_preconfigure: revert to awk for asserting /etc/hosts
+        | sap_general_preconfigure: use tags for limiting the role scope
+        | sap_general_preconfigure: use the package module in most cases
+        | sap_general_preconfigure: use the role sap_maintain_etc_hosts - RHEL systems
+        | sap_hana_preconfigure: move handlers to the correct location
+        | sap_hana_preconfigure: catch SELinux disabled
+        | sap_hana_preconfigure: update kernel parameters for SLES
+        | sap_netweaver_preconfigure: sync with SAP note 3119751 v.13 for RHEL
+        | sap_anydb_install_oracle: fix temp directory removal
+        | sap_ha_pacemaker_cluster: use expect Ansible Module and add python3-pip requirement
+        | sap_ha_pacemaker_cluster: add retry for Azure Files (NFS) to avoid locks
+        | sap_ha_pacemaker_cluster: variable changes for different os and platforms
+        | sap_ha_pacemaker_cluster: fix pcs resource restart
+        | sap_hana_install: update documentation for parameter sap_hana_install_force
+        | sap_install_media_detect: detection of SAP Kernel Part I only
+        | sap_install_media_detect: duplicate SAR file handling for SAP Kernel, IGS, WebDisp
+        | sap_install_media_detect: directory handling fix for SAP SWPM
+        | sap_maintain_etc_hosts: fix wrong assert messages
+        | sap_maintain_etc_hosts: remove use ansible.utils.ip
+        | sap_storage_setup: fix for TB disks
+        | sap_swpm: directory handling fix for SAP SWPM
+        | sap_swpm: align execution and monitoring timeouts to 24hrs (86400s)
+        | sap_swpm: optionally skip setting file permissions
+        '
+    release_date: '2024-06-20'

galaxy.yml

@@ -10,7 +10,7 @@ namespace: community
 name: sap_install
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.4.0
+version: 1.4.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -25,6 +25,7 @@ authors:
   - Janine Fuchs <jfuchs(at)redhat.com>
   - Steven Stringer <steven.stringer(at)suse.com>
   - Marcel Mamula <marcel.mamula(at)suse.com>
+  - Gabriele Puliti <gabriele.puliti(at)suse.com>
 
 ### OPTIONAL but strongly recommended
 # A short summary description of the collection

playbooks/sample-sap-swpm-default-mode.yml

@@ -13,6 +13,7 @@
     - name: Import variables for sap_swpm Ansible Role (Default Mode)
       ansible.builtin.include_vars:
 #        file: ./sample-variables-sap-swpm-default-mode-bw4hana-onehost-install.yml
+#        file: ./sample-variables-sap-swpm-default-mode-s4hana-distributed-aas-install
 #        file: ./sample-variables-sap-swpm-default-mode-s4hana-distributed-ascs-install
 #        file: ./sample-variables-sap-swpm-default-mode-s4hana-distributed-dbload-install
 #        file: ./sample-variables-sap-swpm-default-mode-s4hana-distributed-ers-install

playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-aas-install.yml

@@ -0,0 +1,55 @@
+---
+
+# Detect SAP NetWeaver software
+sap_install_media_detect_source_directory: "/software"
+sap_install_media_detect_source: local_dir
+sap_install_media_detect_swpm: true
+sap_install_media_detect_hostagent: true
+sap_install_media_detect_igs: true
+sap_install_media_detect_kernel: true
+sap_install_media_detect_webdisp: false
+
+# Product ID for New Installation
+sap_swpm_product_catalog_id: NW_DI:S4HANA2020.CORE.HDB.PD
+#NW_DI:S4HANA2020.CORE.HDB.ABAPHA 
+
+# Generate inifile.params using sap_swpm Ansible Role
+sap_swpm_inifile_list:
+  - swpm_installation_media
+  - credentials
+  - db_connection_nw_hana
+  - nw_config_other
+  - nw_config_additional_application_server_instance
+  - nw_config_host_agent
+  - sap_os_linux_user
+
+# Software
+sap_swpm_software_path: /software/download_basket
+sap_swpm_sapcar_path: /software/download_basket
+sap_swpm_swpm_path: /software/download_basket
+
+# NW Passwords
+sap_swpm_master_password: "NewPass$321"
+sap_swpm_ddic_000_password: "NewPass$321"
+
+# HDB Passwords
+sap_swpm_db_system_password: "NewPass$321"
+sap_swpm_db_systemdb_password: "NewPass$321"
+sap_swpm_db_schema_abap: "SAPHANADB"
+sap_swpm_db_schema_abap_password: "NewPass$321"
+sap_swpm_db_sidadm_password: "NewPass$321"
+
+# NW Instance Parameters
+sap_swpm_sid: S4D
+sap_swpm_aas_instance_nr: "00"
+sap_swpm_aas_instance_hostname: "s4h2020aas"
+
+# Unix User ID
+sap_swpm_sapadm_uid: '3000'
+sap_swpm_sapsys_gid: '3001'
+sap_swpm_sidadm_uid: '3001'
+
+# HDB Instance Parameters
+sap_swpm_db_host: "hana01"
+sap_swpm_db_sid: HDD
+sap_swpm_db_instance_nr: "00"

playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-abap-onehost-install.yml

@@ -32,7 +32,7 @@ sap_swpm_inifile_list:
   - nw_config_java_ume
   - nw_config_host_agent
   - sap_os_linux_user
-  - solman_credentials_swpm1
+  - nw_config_java_icm_credentials
   - solman_abap_swpm1
 
 # Software

playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-java-onehost-install.yml

@@ -31,7 +31,7 @@ sap_swpm_inifile_list:
   - nw_config_ports
   - nw_config_host_agent
 #  - sap_os_linux_user # Ignore, and SAP SWPM will auto-assign UID and GID
-  - solman_credentials_swpm1
+  - nw_config_java_icm_credentials
   - nw_config_java_feature_template_ids
 
 sap_swpm_java_template_id_selected_list:

roles/sap_anydb_install_oracle/tasks/oracledb_install_post_mopatch.yml

@@ -89,5 +89,5 @@
 
 - name: Oracle DB Patch - Remove the temp dir
   ansible.builtin.file:
-  path: "{{ sap_anydb_install_oracle_base }}/tmp_sbp"
-  state: absent
+    path: "{{ sap_anydb_install_oracle_base }}/tmp_sbp"
+    state: absent