From 4bf8f9ec5b924dcc57f765c83ed5b7dfbf363eee Mon Sep 17 00:00:00 2001 From: sean-freeman <1815807+sean-freeman@users.noreply.github.com> Date: Mon, 14 Aug 2023 15:56:29 +0100 Subject: [PATCH 1/2] collection: bug fix on sample playbooks --- ...-variables-sap-swpm-advanced-mode-s4hana-onehost-install.yml | 2 +- .../vars/sample-variables-sap-swpm-advanced-templates-mode.yml | 2 +- ...-variables-sap-swpm-default-mode-bw4hana-onehost-install.yml | 2 +- ...es-sap-swpm-default-mode-s4hana-distributed-ascs-install.yml | 2 +- ...-sap-swpm-default-mode-s4hana-distributed-dbload-install.yml | 2 +- ...les-sap-swpm-default-mode-s4hana-distributed-ers-install.yml | 2 +- ...les-sap-swpm-default-mode-s4hana-distributed-pas-install.yml | 2 +- ...e-variables-sap-swpm-default-mode-s4hana-onehost-install.yml | 2 +- ...e-variables-sap-swpm-default-mode-s4hana-onehost-restore.yml | 2 +- ...s-sap-swpm-default-mode-solman-hana-abap-onehost-install.yml | 2 +- ...s-sap-swpm-default-mode-solman-hana-java-onehost-install.yml | 2 +- ...riables-sap-swpm-default-mode-webdisp-standalone-install.yml | 2 +- .../vars/sample-variables-sap-swpm-default-templates-mode.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/playbooks/vars/sample-variables-sap-swpm-advanced-mode-s4hana-onehost-install.yml b/playbooks/vars/sample-variables-sap-swpm-advanced-mode-s4hana-onehost-install.yml index de9130313..74511ff45 100644 --- a/playbooks/vars/sample-variables-sap-swpm-advanced-mode-s4hana-onehost-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-advanced-mode-s4hana-onehost-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP HANA and SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-advanced-templates-mode.yml b/playbooks/vars/sample-variables-sap-swpm-advanced-templates-mode.yml index 98d1b61ac..3a78f204b 100644 --- a/playbooks/vars/sample-variables-sap-swpm-advanced-templates-mode.yml +++ b/playbooks/vars/sample-variables-sap-swpm-advanced-templates-mode.yml @@ -2,7 +2,7 @@ # Detect SAP HANA and SAP NetWeaver software # Set vars: on each Ansible Task depending on chosen template -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-bw4hana-onehost-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-bw4hana-onehost-install.yml index 7e68405ae..3a79a2a28 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-bw4hana-onehost-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-bw4hana-onehost-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP HANA and SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ascs-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ascs-install.yml index ca0e37761..a39c9c1aa 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ascs-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ascs-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-dbload-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-dbload-install.yml index 44fcf69d0..08d27d15f 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-dbload-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-dbload-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ers-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ers-install.yml index 094e7b8f7..3a053ff2a 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ers-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-ers-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-pas-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-pas-install.yml index 414285f8a..49379bf5e 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-pas-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-distributed-pas-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-install.yml index ffe0bd345..d8e5cdf73 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP HANA and SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-restore.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-restore.yml index 2706037ce..1ec025002 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-restore.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-s4hana-onehost-restore.yml @@ -1,7 +1,7 @@ --- # Detect SAP HANA and SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-abap-onehost-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-abap-onehost-install.yml index 7e017b89f..d1d9c10e0 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-abap-onehost-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-abap-onehost-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP HANA and SAP NetWeaver software -sap_install_media_detect_directory: "/software" +sap_install_media_detect_source_directory: "/software" sap_install_media_detect_source: local_dir sap_install_media_detect_db: "saphana" sap_install_media_detect_swpm: true diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-java-onehost-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-java-onehost-install.yml index 96e9a8116..6014fe636 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-java-onehost-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-java-onehost-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP HANA and SAP NetWeaver software -sap_install_media_detect_directory: "/software" +sap_install_media_detect_source_directory: "/software" sap_install_media_detect_source: local_dir sap_install_media_detect_db: "saphana" sap_install_media_detect_swpm: true diff --git a/playbooks/vars/sample-variables-sap-swpm-default-mode-webdisp-standalone-install.yml b/playbooks/vars/sample-variables-sap-swpm-default-mode-webdisp-standalone-install.yml index d9f7b48d2..346d4aabf 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-mode-webdisp-standalone-install.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-mode-webdisp-standalone-install.yml @@ -1,7 +1,7 @@ --- # Detect SAP HANA and SAP NetWeaver software -sap_install_media_detect_directory: "/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 diff --git a/playbooks/vars/sample-variables-sap-swpm-default-templates-mode.yml b/playbooks/vars/sample-variables-sap-swpm-default-templates-mode.yml index ac5bfc753..bfeafde97 100644 --- a/playbooks/vars/sample-variables-sap-swpm-default-templates-mode.yml +++ b/playbooks/vars/sample-variables-sap-swpm-default-templates-mode.yml @@ -2,7 +2,7 @@ # Detect SAP HANA and SAP NetWeaver software # Set vars: on each Ansible Task depending on chosen template -sap_install_media_detect_directory: "/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 From 1104e9555211f657ad7de4ac14b6f98498bff17c Mon Sep 17 00:00:00 2001 From: sean-freeman <1815807+sean-freeman@users.noreply.github.com> Date: Mon, 14 Aug 2023 15:56:46 +0100 Subject: [PATCH 2/2] collection: prepare for v1.3.1 --- CHANGELOG.rst | 15 +++++++++++++++ README.md | 22 +++++++++++++--------- galaxy.yml | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ac14c5a94..8cae9cc30 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,21 @@ community.sap_install Release Notes .. contents:: Topics +v1.3.1 +====== + +Release Summary +--------------- + +| Release Date: 2023-08-14 +| sap_ha_pacemaker_cluster: Improved AWS constructs based on feedback +| sap_ha_pacemaker_cluster: Improved no STONITH resource definition handling +| sap_hana_install: Bug fix for arg spec on deprecated vars +| sap_hostagent: Bug fix for media handling +| sap_install_media_detect: Improved handling based on feedback +| sap_storage_setup: Bug fix for existing storage devices +| sap_swpm: Make full log output optional and replace with sapcontrol log final status +| collection: Bug fix for sample Ansible Playbooks v1.3.0 ====== diff --git a/README.md b/README.md index 22041e047..db49c28ce 100644 --- a/README.md +++ b/README.md @@ -95,25 +95,29 @@ There are various methods to execute the Ansible Collection, dependant on the us | ---- | ---- | ---- | | Ansible Playbook
-> source Ansible Collection
-> execute Ansible Task
--> run Ansible Role
---> run Ansible Module for Shell (built-in)
---> ... | Complex executions with various interlinked activities;
run in parallel or sequentially | Localhost or Remote | -## Requirements, Dependencies and Testing +## Testing, Requirements and Dependencies -## Testing with SAP Software Provisioning Manager (SWPM) +### Testing Various SAP Software solutions have been extensively tested: - SAP HANA -- SAP NetWeaver AS (ABAP or JAVA) -- SAP S/4HANA AnyPremise 1809, 1909, 2020, 2021 - - One Host installation - - Dual Host installation + - Scale-Up + - Scale-Out + - High Availability +- SAP NetWeaver AS (ABAP or JAVA) and additional addons (e.g. GRC, ADS) +- SAP S/4HANA AnyPremise (1809, 1909, 2020, 2021, 2022) + - Sandbox (One Host) installation + - Standard (Dual Host) installation - Distributed installation - High Availability installation - System Copy (Homogeneous with SAP HANA Backup / Recovery) installation + - Maintenance Planner installation - System Rename - SAP BW/4HANA +- SAP Business Suite on HANA (SoH, i.e. SAP ECC on HANA) +- SAP Business Suite (i.e. SAP ECC with SAP AnyDB - SAP ASE, SAP MaxDB, IBM Db2, Oracle DB) - SAP Solution Manager 7.2 -- SAP Business Suite (i.e. ECC) -- SAP NetWeaver applications (e.g. GRC) - SAP Web Dispatcher ### Target host - Operating System requirements @@ -136,7 +140,7 @@ N.B. The Ansible Collection works with SLES from version 15 SP3 and upwards, for Execution of Ansible Playbooks using this Ansible Collection have been tested with: - Python 3.9.7 and above (i.e. CPython distribution) -- Ansible Core 2.11.5 and above (included with optional installation of Ansible Community Edition 4.0 and above) +- Ansible Core 2.11.5 and above _(included with optional installation of Ansible Community Edition 4.0 and above)_ - OS: macOS with Homebrew, RHEL, SLES, and containers in Task Runners (e.g. Azure DevOps) ## License diff --git a/galaxy.yml b/galaxy.yml index 45d526643..9f4417e77 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -10,7 +10,7 @@ namespace: community name: sap_install # The version of the collection. Must be compatible with semantic versioning -version: 1.3.0 +version: 1.3.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md