Merge pull request sap-linuxlab#361 from sap-linuxlab/dev

Merge dev to main for release 1.2.3

CHANGELOG.rst

@@ -6,6 +6,18 @@ community.sap_install Release Notes
 
 
 
+v1.2.3
+======
+
+Release Summary
+---------------
+
+| Release Date: 2022-04-25
+| sap_hana_preconfigure: Some modifications for HANA on RHEL 9
+| sap_ha_pacemaker_cluster: Support for custom stonith resource definitions containing more than one element
+| sap_hana_preconfigure: Be more flexible with IBM service and productivity tools
+
+
 v1.2.2
 ======
 

galaxy.yml

@@ -10,7 +10,7 @@ namespace: community
 name: sap_install
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.2.2
+version: 1.2.3
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

playbooks/sample-sap-hana-install.yml

@@ -1,8 +1,9 @@
 ---
-- hosts: all
+- name: Ansible Play for executing SAP HANA installation to all hosts in Ansible Inventory
+  hosts: all
   become: true
   pre_tasks:
-    - name: Include vars
+    - name: Include variables
       ansible.builtin.include_vars: ./vars/sample-variables-sap-hana-install.yml
   roles:
     - { role: ../roles/sap_hana_install }

playbooks/sample-sap-hana-preconfigure.yml

@@ -1,8 +1,13 @@
 ---
-- hosts: all
+- name: Ansible Play for executing preconfiguration activities for SAP HANA to all hosts in Ansible Inventory
+  hosts: all
   become: true
   vars:
+    sap_general_preconfigure_fail_if_reboot_required: no
     sap_hana_preconfigure_fail_if_reboot_required: no
     sap_hana_preconfigure_update: yes
+    sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: no
   roles:
+    - { role: community.sap_install.sap_general_preconfigure }
     - { role: community.sap_install.sap_hana_preconfigure }
+    - { role: community.sap_install.sap_netweaver_preconfigure }

playbooks/sample-sap-storage-prep.yml

@@ -1,8 +1,12 @@
 ---
+
+# Experimental Ansible Role, do not suggest using this
+
 - hosts: all
   become: true
   pre_tasks:
-    - include_vars: ./vars/sample-variables-sap-storage-partitions.yml
+#    - include_vars: ./vars/sample-variables-sap-storage-lvm.yml
+#    - include_vars: ./vars/sample-variables-sap-storage-lvm-stripes.yml
 
   tasks:
 

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

@@ -1,6 +1,23 @@
 ---
-- hosts: all
+# Ansible Playbook for executing sap_swpm Ansible in "Advanced Mode"
+
+- name: Ansible Play for executing SAP SWPM to all hosts in Ansible Inventory
+  hosts: all
+  become: true
+
   vars:
     sap_swpm_ansible_role_mode: advanced
-  roles:
-    - { role: ../roles/sap_swpm }
+
+  tasks:
+
+    - name: Import variables for sap_swpm Ansible Role (Advanced Mode)
+      ansible.builtin.include_vars:
+#        file: ./sample-variables-sap-swpm-advanced-mode-s4hana-install.yml
+
+    - name: Execute Ansible Role sap_install_media_detect
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_install_media_detect }
+
+    - name: Execute Ansible Role sap_swpm
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_swpm }

playbooks/sample-sap-swpm-advanced-templates-mode.yml

@@ -1,7 +1,32 @@
 ---
-- hosts: all
+# Ansible Playbook for executing sap_swpm Ansible in "Advanced Templates Mode"
+
+- name: Ansible Play for executing SAP SWPM to all hosts in Ansible Inventory
+  hosts: all
+  become: true
+
   vars:
     sap_swpm_ansible_role_mode: advanced_templates
-    sap_swpm_templates_product_input: sap_s4hana_2020_onehost_install
-  roles:
-    - { role: ../roles/sap_swpm }
+#    sap_swpm_templates_product_input: sap_system_rename
+#    sap_swpm_templates_product_input: sap_s4hana_2021_onehost_install
+#    sap_swpm_templates_product_input: sap_s4hana_2021_onehost_system_restore
+#    sap_swpm_templates_product_input: sap_s4hana_2020_onehost_install
+#    sap_swpm_templates_product_input: sap_s4hana_2020_onehost_system_restore
+#    sap_swpm_templates_product_input: sap_bw4hana_2021_install
+#    sap_swpm_templates_product_input: sap_webdisp_7_50_install
+#    sap_swpm_templates_product_input: sap_solman_7_20_abap
+#    sap_swpm_templates_product_input: sap_solman_7_20_java
+
+  tasks:
+
+    - name: Import variables for sap_swpm Ansible Role (Advanced Templates Mode)
+      ansible.builtin.include_vars:
+        file: ./sample-variables-sap-swpm-advanced-templates-mode.yml
+
+    - name: Execute Ansible Role sap_install_media_detect
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_install_media_detect }
+
+    - name: Execute Ansible Role sap_swpm
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_swpm }

playbooks/sample-sap-swpm-all-modes-interactive.yml

@@ -1,102 +1,97 @@
 ---
-- hosts: all
+# Ansible Playbook for executing sap_swpm Ansible Role with interactive selection of mode (Inifile Reuse, Default, Advanced, Default Templates, Advanced Templates)
 
+- name: Ansible Play for executing SAP SWPM to all hosts in Ansible Inventory
+  hosts: all
   become: true
 
-  name: Playbook sample for SAP SWPM
-
-  roles:
-    - { role: ../roles/sap_swpm }
-
-
 # Prompt for Ansible Variables, using pause for conditional argument
 # Avoid vars prompt, so Facts Gathering does not split the input of a user
   pre_tasks:
 
-    - pause:
+    - ansible.builtin.pause:
         prompt: "Choose: default, advanced, inifile_reuse. Alternatively use default_templates or advanced_templates"
       register: prompt
       no_log: yes
       run_once: yes
 
-    - set_fact:
+    - ansible.builtin.set_fact:
         sap_swpm_ansible_role_mode: "{{ prompt.user_input }}"
       no_log: yes
       run_once: yes
 
-    - pause:
+    - ansible.builtin.pause:
         prompt: "Mode is {{ sap_swpm_ansible_role_mode }}, but variables not detected. Define path to YAML file with Ansible Variables"
       register: prompt
       no_log: no
       run_once: yes
       when:
         - (sap_swpm_ansible_role_mode == "default" or sap_swpm_ansible_role_mode == "advanced")
         - (sap_swpm_product_catalog_id is not defined or sap_swpm_product_catalog_id == None)
-    - include_vars:
+    - ansible.builtin.include_vars:
         file: "{{ prompt.user_input }}"
       no_log: no
       run_once: yes
       when:
         - (sap_swpm_ansible_role_mode == "default" or sap_swpm_ansible_role_mode == "advanced")
         - (sap_swpm_product_catalog_id is not defined or sap_swpm_product_catalog_id == None)
 
-    - pause:
+    - ansible.builtin.pause:
         prompt: "Mode is {{ sap_swpm_ansible_role_mode }}, but inifile.params not detected. Define path to inifile.params"
       register: prompt
       no_log: yes
       run_once: yes
       when:
         - sap_swpm_ansible_role_mode == "inifile_reuse"
-    - set_fact:
+    - ansible.builtin.set_fact:
         sap_swpm_inifile_reuse_source: "{{ prompt.user_input }}"
       no_log: no
       run_once: yes
       when:
         - sap_swpm_ansible_role_mode == "inifile_reuse"
 
-    - pause:
+    - ansible.builtin.pause:
         prompt: "Mode is {{ sap_swpm_ansible_role_mode }}, but variables not detected. Define path to YAML file with Ansible Variables"
       register: prompt
       no_log: no
       run_once: yes
       when:
         - (sap_swpm_ansible_role_mode == "default_templates" or sap_swpm_ansible_role_mode == "advanced_templates")
         - (sap_swpm_templates_install_dictionary is not defined or sap_swpm_templates_install_dictionary == None)
-    - include_vars:
+    - ansible.builtin.include_vars:
         file: "{{ prompt.user_input }}"
       no_log: no
       run_once: yes
       when:
         - (sap_swpm_ansible_role_mode == "default_templates" or sap_swpm_ansible_role_mode == "advanced_templates")
         - (sap_swpm_templates_install_dictionary is not defined or sap_swpm_templates_install_dictionary == None)
-    - pause:
+    - ansible.builtin.pause:
         prompt: "Mode is {{ sap_swpm_ansible_role_mode }}, define which template to run (e.g. sap_s4hana_2020_onehost_install)"
       register: prompt
       no_log: yes
       run_once: yes
       when:
         - sap_swpm_ansible_role_mode == "default_templates" or sap_swpm_ansible_role_mode == "advanced_templates"
-    - set_fact:
+    - ansible.builtin.set_fact:
         sap_swpm_templates_product_input: "{{ prompt.user_input }}"
       no_log: no
       run_once: yes
       when:
         - sap_swpm_ansible_role_mode == "default_templates" or sap_swpm_ansible_role_mode == "advanced_templates"
 
     - name: Display Ansible Role for SAP SWPM using default or advanced templates mode
-      debug:
+      ansible.builtin.debug:
         msg: "Ansible Role for SAP SWPM mode is {{ sap_swpm_ansible_role_mode }}, using the following values: {{ sap_swpm_templates_install_dictionary }}"
       when:
         - sap_swpm_ansible_role_mode == "default_templates" or sap_swpm_ansible_role_mode == "advanced_templates"
 
 
-# Execute SAP SWPM
   tasks:
 
     - name: Execute Ansible Role sap_install_media_detect
-      include_role:
-        name: { role: lss.sap_install.sap_install_media_detect }
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_install_media_detect }
 
-    - name: Execute Ansible Role sap_swpm with SAP S/4HANA One Host, System Copy Homogeneous (SAP HANA Backup/Restore)
-      include_role:
-        name: { role: lss.sap_install.sap_swpm }
+    - name: Execute Ansible Role sap_swpm
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_swpm }

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

@@ -1,6 +1,33 @@
 ---
-- hosts: all
+# Ansible Playbook for executing sap_swpm Ansible in "Default Mode"
+
+- name: Ansible Play for executing SAP SWPM to all hosts in Ansible Inventory
+  hosts: all
+  become: true
+
   vars:
     sap_swpm_ansible_role_mode: default
-  roles:
-    - { role: ../roles/sap_swpm }
+
+  tasks:
+
+    - 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-ascs-install
+#        file: ./sample-variables-sap-swpm-default-mode-s4hana-distributed-dbload-install
+#        file: ./sample-variables-sap-swpm-default-mode-s4hana-distributed-ers-install
+#        file: ./sample-variables-sap-swpm-default-mode-s4hana-distributed-pas-install
+#        file: ./sample-variables-sap-swpm-default-mode-s4hana-onehost-install.yml
+#        file: ./sample-variables-sap-swpm-default-mode-s4hana-onehost-restore.yml
+#        file: ./sample-variables-sap-swpm-default-mode-solman-abap-onehost-install.yml
+#        file: ./sample-variables-sap-swpm-default-mode-solman-java-onehost-install.yml
+#        file: ./sample-variables-sap-swpm-default-mode-system-rename.yml
+#        file: ./sample-variables-sap-swpm-default-mode-webdisp-standalone-install.yml
+
+    - name: Execute Ansible Role sap_install_media_detect
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_install_media_detect }
+
+    - name: Execute Ansible Role sap_swpm
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_swpm }

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

@@ -1,7 +1,26 @@
 ---
-- hosts: all
+# Ansible Playbook for executing sap_swpm Ansible in "Default Templates Mode"
+
+- name: Ansible Play for executing SAP SWPM to all hosts in Ansible Inventory
+  hosts: all
+  become: true
+
   vars:
     sap_swpm_ansible_role_mode: default_templates
-    sap_swpm_templates_product_input: sap_s4hana_2020_onehost_install
-  roles:
-    - { role: ../roles/sap_swpm }
+#    sap_swpm_templates_product_input: sap_system_rename
+#    sap_swpm_templates_product_input: sap_s4hana_2020_onehost_install
+#    sap_swpm_templates_product_input: sap_s4hana_2020_onehost_system_restore
+
+  tasks:
+
+    - name: Import variables for sap_swpm Ansible Role (Default Templates Mode)
+      ansible.builtin.include_vars:
+        file: ./sample-variables-sap-swpm-default-templates-mode.yml
+
+    - name: Execute Ansible Role sap_install_media_detect
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_install_media_detect }
+
+    - name: Execute Ansible Role sap_swpm
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_swpm }

playbooks/sample-sap-swpm-inifile-reuse-mode.yml

@@ -1,7 +1,20 @@
 ---
-- hosts: all
+# Ansible Playbook for executing sap_swpm Ansible in "Inifile Reuse Mode"
+
+- name: Ansible Play for executing SAP SWPM to all hosts in Ansible Inventory
+  hosts: all
+  become: true
+
   vars:
     sap_swpm_ansible_role_mode: inifile_reuse
-    sap_swpm_inifile_reuse_source: vars/custom/dummy.inifile.params
-  roles:
-    - { role: ../roles/sap_swpm }
+#    sap_swpm_inifile_reuse_source: ./sample-sap-swpm-inifile-reuse-mode-sample.inifile.params
+
+  tasks:
+
+    - name: Execute Ansible Role sap_install_media_detect
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_install_media_detect }
+
+    - name: Execute Ansible Role sap_swpm
+      ansible.builtin.include_role:
+        name: { role: community.sap_install.sap_swpm }