import rhel-system-roles-sap-3.3.0-3.el8

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-SOURCES/community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32.tar.gz
+SOURCES/community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f.tar.gz

.rhel-system-roles-sap.metadata

@@ -1,2 +1,2 @@
 584f8d1681adf13cb7af256a7b38d94ca80dcab2 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-d1be0a3996b7927827767f0a79a1613992d9a59c SOURCES/community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32.tar.gz
+831f15e14b4fe7bc152c46f882280ac7db0f52f8 SOURCES/community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f.tar.gz

SOURCES/README.md

@@ -1,7 +1,7 @@
 Red Hat Enterprise Linux System Roles for SAP Ansible Collection
 =====================================
 
-Red Hat Enterprise Linux System Roles for SAP is a set of roles for preparing Red Hat Enterprise Linux systems for the initial installation of SAP NetWeaver and SAP HANA, and for installing SAP HANA.
+Red Hat Enterprise Linux System Roles for SAP is a set of roles for preparing Red Hat Enterprise Linux systems for the initial installation of SAP NetWeaver and SAP HANA, for installing SAP HANA Scale-Up and Scale-Out, and for installing a SAP HANA Two-Node Scale-Up cluster.
 
 ## Dependencies
 
@@ -56,4 +56,8 @@ The modules and other plugins in this collection are private, used only internal
 
 <!--ts-->
   * sap_hana_install
+  * sap_ha_install_hana_hsr
+  * sap_ha_prepare_pacemaker
+  * sap_ha_install_pacemaker
+  * sap_ha_set_hana
 <!--te-->

SOURCES/community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch

@@ -1,64 +0,0 @@
-diff -up community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml.me community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml
---- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml.me	2022-05-23 20:03:38.155660382 +0200
-+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml	2022-05-23 20:06:38.667894467 +0200
-@@ -18,14 +18,26 @@
-         __sap_general_preconfigure_req_ha_repos: ''
-       when: not sap_general_preconfigure_use_ha_repos
- 
--    - name: Assert - Set final list of repos, auto
-+    - name: Assert - Set final list of repos, non-s390x, auto
-       set_fact:
-         __sap_general_preconfigure_req_repos:
-           "{{ __sap_general_preconfigure_req_os_repos | list }} +
-            {{ __sap_general_preconfigure_req_netweaver_repos | list }} +
-            {{ __sap_general_preconfigure_req_hana_repos | list }} +
-            {{ __sap_general_preconfigure_req_ha_repos | list }}"
--      when: sap_general_preconfigure_req_repos is undefined
-+      when:
-+        - sap_general_preconfigure_req_repos is undefined
-+        - ansible_architecture != 's390x'
-+
-+    - name: Assert - Set final list of repos, s390x, auto
-+      set_fact:
-+        __sap_general_preconfigure_req_repos:
-+          "{{ __sap_general_preconfigure_req_os_repos | list }} +
-+           {{ __sap_general_preconfigure_req_netweaver_repos | list }} +
-+           {{ __sap_general_preconfigure_req_ha_repos | list }}"
-+      when:
-+        - sap_general_preconfigure_req_repos is undefined
-+        - ansible_architecture == 's390x'
- 
-     - name: Assert - Set final list of repos, manual
-       set_fact:
-diff -up community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml.me community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml
---- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml.me	2022-05-23 20:07:10.469897468 +0200
-+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml	2022-05-23 20:08:27.072770838 +0200
-@@ -18,14 +18,26 @@
-         __sap_general_preconfigure_req_ha_repos: ''
-       when: not sap_general_preconfigure_use_ha_repos
- 
--    - name: Set final list of repos, auto
-+    - name: Set final list of repos, non-s390x, auto
-       set_fact:
-         __sap_general_preconfigure_req_repos:
-           "{{ __sap_general_preconfigure_req_os_repos | list }} +
-            {{ __sap_general_preconfigure_req_netweaver_repos | list }} +
-            {{ __sap_general_preconfigure_req_hana_repos | list }} +
-            {{ __sap_general_preconfigure_req_ha_repos | list }}"
--      when: sap_general_preconfigure_req_repos is undefined
-+      when:
-+        - sap_general_preconfigure_req_repos is undefined
-+        - ansible_architecture != 's390x'
-+
-+    - name: Set final list of repos, s390x, auto
-+      set_fact:
-+        __sap_general_preconfigure_req_repos:
-+          "{{ __sap_general_preconfigure_req_os_repos | list }} +
-+           {{ __sap_general_preconfigure_req_netweaver_repos | list }} +
-+           {{ __sap_general_preconfigure_req_ha_repos | list }}"
-+      when:
-+        - sap_general_preconfigure_req_repos is undefined
-+        - ansible_architecture == 's390x'
- 
-     - name: Set final list of repos, manual
-       set_fact:

SOURCES/community.sap_install-shebang.patch

@@ -0,0 +1,90 @@
+diff -up community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py.me community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py
+--- community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py.me	2022-07-12 16:23:48.262581739 +0200
++++ community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py	2022-07-12 16:36:43.620709628 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ """
+ Tests for role sap_general_preconfigure
+diff -up community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py.me community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py
+--- community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py.me	2022-07-12 16:36:52.262900877 +0200
++++ community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py	2022-07-12 16:36:59.246055414 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ import os
+ import sys
+diff -up community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py.me community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py
+--- community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py.me	2022-07-12 16:37:17.272454327 +0200
++++ community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py	2022-07-12 16:37:24.142606360 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ import os
+ import sys
+diff -up community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py.me community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py
+--- community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py.me	2022-07-12 16:37:52.794240408 +0200
++++ community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py	2022-07-12 16:37:58.553367854 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ """
+ Tests for role sap_hana_preconfigure
+diff -up community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py.me community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py
+--- community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py.me	2022-07-12 16:37:34.384833016 +0200
++++ community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py	2022-07-12 16:37:41.495990384 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ """
+ Tests for role sap_netweaver_preconfigure
+diff -up community.sap_install/tools/swpm2_parameters_inifile_generate.py.me community.sap_install/tools/swpm2_parameters_inifile_generate.py
+--- community.sap_install/tools/swpm2_parameters_inifile_generate.py.me	2022-07-12 16:38:10.026621753 +0200
++++ community.sap_install/tools/swpm2_parameters_inifile_generate.py	2022-07-12 16:38:29.915061875 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ from __future__ import (absolute_import, division, print_function)
+ __metaclass__ = type
+ 
+diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh
+--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh.me	2022-07-12 17:48:10.476508351 +0200
++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh	2022-07-12 17:48:27.813896005 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/bash
+ 
+ # default font color: Light Cyan, which should be readable on both bright and dark background
+ __FONT_COLOR=36m
+diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh
+--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh.me	2022-07-12 17:48:35.527068474 +0200
++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh	2022-07-12 17:48:43.703251292 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/bash
+ 
+ while true; do
+ # in case hdblcm has not yet started, we assume that it is waiting for sapdsigner to complete:
+diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh
+--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh.me	2022-07-12 17:49:22.425117059 +0200
++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh	2022-07-12 17:49:30.241291825 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/bash
+ 
+ # default font color: Light Cyan, which should be readable on both bright and dark background
+ __FONT_COLOR=36m
+diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh
+--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh.me	2022-07-12 17:48:51.584427510 +0200
++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh	2022-07-12 17:49:00.678630847 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/bash
+ 
+ # default font color: Light Cyan, which should be readable on both bright and dark background
+ __FONT_COLOR=36m

SOURCES/galaxy.yml

@@ -3,13 +3,13 @@
 # The namespace of the collection. This can be a company/brand/organization or product namespace under which all
 # content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
 # underscores or numbers and cannot contain consecutive underscores
-namespace: redhat
+namespace: __NAMESPACE__
 
 # The name of the collection. Has the same character restrictions as 'namespace'
 name: sap_install
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.0
+version: 1.1.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -21,11 +21,13 @@ authors:
 - Sean Freeman <sean.freeman@uk.ibm.com>
 - Rainer Leber <rainer.leber@sva.de>
 - Markus Koch <mkoch@redhat.com>
+- Markus Moster <mmoster@redhat.com>
+- Janine Fuchs <jfuchs@redhat.com>
 
 ### OPTIONAL but strongly recommended
 
 # A short summary description of the collection
-description: Ansible Collection for installing SAP NetWeaver or SAP HANA on Linux
+description: Collection of Ansible Roles for SAP software installation on Red Hat Enterprise Linux
 
 # Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
 # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
@@ -38,7 +40,10 @@ license:
 
 # A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
 # requirements as 'namespace' and 'name'
-tags: [sap]
+tags:
+- database
+- application
+- sap
 
 # Collections that this collection requires to be installed for it to be usable. The key of the dict is the
 # collection label 'namespace.name'. The value is a version range
@@ -57,3 +62,9 @@ homepage: https://sap-linuxlab.github.io
 
 # The URL to the collection issue tracker
 issues: https://github.com/sap-linuxlab/community.sap_install/issues
+
+# A list of file glob-like patterns used to filter any files or directories that should not be included in the build
+# artifact. A pattern is matched from the relative path of the file or directory of the collection directory. This
+# uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry',
+# and '.git' are always filtered
+build_ignore: ['tests', 'internal-*']

SOURCES/sap-hana-preconfigure-md2html-error.patch

@@ -1,6 +1,6 @@
-diff -up sap-hana-preconfigure/README.md.me sap-hana-preconfigure/README.md
+diff -up community.sap_install/roles/sap_hana_preconfigure/README.md.me community.sap_install/roles/sap_hana_preconfigure/README.md
---- sap-hana-preconfigure/README.md.me	2021-03-22 14:08:21.960414814 +0100
+--- community.sap_install/roles/sap_hana_preconfigure/README.md.me	2021-03-22 14:08:21.960414814 +0100
-+++ sap-hana-preconfigure/README.md	2021-03-22 14:10:28.220020075 +0100
++++ community.sap_install/roles/sap_hana_preconfigure/README.md	2021-03-22 14:10:28.220020075 +0100
 @@ -216,13 +216,13 @@ In case you want the role to set or chec
  sap_hana_preconfigure_use_netapp_settings_nfsv3
  ```

SOURCES/sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch

@@ -1,18 +0,0 @@
-diff -up sap_hana_preconfigure/handlers/main.yml.me sap_hana_preconfigure/handlers/main.yml
---- sap_hana_preconfigure/handlers/main.yml.me	2022-06-08 18:52:49.832790508 +0200
-+++ sap_hana_preconfigure/handlers/main.yml	2022-06-08 18:53:28.792668038 +0200
-@@ -37,12 +37,14 @@
- - name: "Set the grub.cfg location RHEL"
-   set_fact:
-     __sap_hana_preconfigure_uefi_boot_dir: /boot/efi/EFI/redhat/grub.cfg
-+  listen: __sap_hana_preconfigure_regenerate_grub2_conf_handler
-   when: 
-     - ansible_distribution == 'RedHat'
- 
- - name: "Set the grub.cfg location SLES"
-   set_fact:
-     __sap_hana_preconfigure_uefi_boot_dir: /boot/efi/EFI/BOOT/grub.cfg
-+  listen: __sap_hana_preconfigure_regenerate_grub2_conf_handler
-   when: 
-     - ansible_distribution == 'SLES' or ansible_distribution == 'SLES_SAP'    
- 

SOURCES/sap_hana_preconfigure-fix-issue-#153.patch

@@ -1,12 +0,0 @@
-diff -up sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml.me sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml
---- sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml.me	2022-06-08 12:49:58.107218399 +0200
-+++ sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml	2022-06-08 12:51:53.264830397 +0200
-@@ -25,7 +25,7 @@
- 
-         - name: Assert that file /etc/rc.d/rc.local exists (x86_64 platform only)
-           assert:
--            that: __stat_boot_local.stat.exists
-+            that: __sap_hana_preconfigure_register_stat_rc_local_assert.stat.exists
-             fail_msg: "FAIL: File /etc/rc.d/rc.local does not exist!"
-             success_msg: "PASS: File /etc/rc.d/rc.local exist."
-           ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors|d(false) }}"

SPECS/rhel-system-roles-sap.spec

@@ -1,18 +1,12 @@
-%if 0%{?fedora} || 0%{?rhel} >= 9
-%bcond_without ansible
-%global ansible_build_dep ansible-core >= 2.11.0
-%else
 %if 0%{?rhel} && ! 0%{?epel}
 %bcond_with ansible
 %else
 %bcond_without ansible
-%global ansible_build_dep ansible >= 2.9.10
-%endif
 %endif
 
 %bcond_with collection_artifact
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if 0%{?fedora} || 0%{?rhel} > 8
 %bcond_without html
 %else
 # pandoc is not supported in rhel 7 and older,
@@ -32,35 +26,45 @@
 # collection_version has to be increased by every rebuild
 # otherwise, it cannot be uploaded to Automation Hub and Galaxy
 # due to version conflict
-%define collection_version 1.0.2
+%define collection_version 1.1.1
 
 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0
-%global commit_id_sap_install 57211739079e4ef37f51c45c30ea071c0956ad32
+%global commit_id_sap_install a2c6785d02092bb9142d9f2c170ad4b097d1af2f
 %global rolename1 sap_general_preconfigure
 %global rolename2 sap_hana_preconfigure
 %global rolename3 sap_netweaver_preconfigure
 %global rolename4 sap_hana_install
+%global rolename5 sap_ha_set_hana
+%global rolename6 sap_ha_set_netweaver
+%global rolename7 sap_hostagent
+%global rolename8 sap_install_media_detect
+%global rolename9 sap_storage
+%global rolename10 sap_swpm
+%global rolename11 sap_ha_install_hana_hsr
+%global rolename12 sap_ha_prepare_pacemaker
+%global rolename13 sap_ha_install_pacemaker
 %global src_owner linux-system-roles
 %global github_repo_sap_install community.sap_install
+%global rolename_rhel %{rolename1} %{rolename2} %{rolename3} %{rolename4} %{rolename5} %{rolename11} %{rolename12} %{rolename13}
+%global rolename_community %{rolename_rhel} %{rolename1} %{rolename6} %{rolename7} %{rolename8} %{rolename9} %{rolename10}
+%if 0%{?fedora}
+%global rolenames %{rolename_community}
+%else
+%global rolenames %{rolename_rhel}
+%endif
 
 Name: %{package_name}
 Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
-Version: 3.2.0
+Version: 3.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Url: https://github.com/berndfinger/community.sap_install
 Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: https://github.com/berndfinger/%{github_repo_sap_install}/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz
-Source4: README.md
+Source4: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/README.md
-Source5: galaxy.yml
+Source5: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/galaxy.yml
-# patches 0-49 for sap-preconfigure
+Patch1: community.sap_install-shebang.patch
-# patches 50-99 for sap-hana-preconfigure
+Patch2: sap-hana-preconfigure-md2html-error.patch
-Patch50: sap-hana-preconfigure-md2html-error.patch
-Patch51: sap_hana_preconfigure-fix-issue-#153.patch
-Patch52: sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch
-# patches 100-149 for sap-netweaver-preconfigur
-# patches 150-199 for sap_general_preconfigure
-Patch150: community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch
 
 BuildArch: noarch
 
@@ -88,12 +92,8 @@ Requires: python-jmespath
 Requires: python-netaddr
 %endif
 
-%if 0%{?rhel} >= 8
-Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
-%endif
-
 %if %{with ansible}
-BuildRequires: %{ansible_build_dep}
+BuildRequires: ansible-core >= 2.9.10
 %endif
 
 %if %{undefined __ansible_provides}
@@ -132,27 +132,24 @@ Collection artifact for %{name}. This package contains %{collection_namespace}-%
 %prep
 %setup -q -a1 -n auto-maintenance-%{mainid}
 
-# cp own galaxy.yml and rename the collection name correctly for Automation Hub and Galaxy
+# add correct version and namespace for Automation Hub and Galaxy
-mkdir .collections
+cp %{SOURCE5} .
-cp %{SOURCE5} galaxy.yml
+sed -i -e "s|^namespace: .*|namespace: %{collection_namespace}|" galaxy.yml
-sed -i -e "s|namespace: redhat|namespace: %{collection_namespace}|" galaxy.yml
+sed -i -e "s|^version: .*|version: %{collection_version}|" galaxy.yml
-# add correct version for Automation Hub and Galaxy
-sed -i -e "s|version: 1.0.0|version: %{collection_version}|" galaxy.yml
 
-pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_hana_preconfigure
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-popd
 pushd %{github_repo_sap_install}-%{commit_id_sap_install}/
-%patch150 -p1
+%patch1 -p1
+%patch2 -p1
 popd
 
+# remove zero file and symlinks
+find . -type f -size 0 -delete
+find . -type l -delete
+
 pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/
-# remove zero file
-rm -f sap_hana_preconfigure/tasks/RedHat_6/recommendations.yml
 # remove all SLES stuff and RHEL 6 stuff
-rm -rf sap_hana_preconfigure/tasks/SLES/
+rm -rf */tasks/SLES/
+rm -f  */vars/SLES_15.yml
 rm -rf sap_hana_preconfigure/tasks/sapnote/1275776 # SLES - sapconf, saptune, etc
 rm -rf sap_hana_preconfigure/tasks/sapnote/1944799 # SLES - HANA install and config guidelines
 rm -f  sap_hana_preconfigure/tasks/sapnote/1944799.yml
@@ -164,57 +161,50 @@ rm -rf sap_hana_preconfigure/tasks/sapnote/2684254 # SLES 15 - OS settings for H
 rm -f  sap_hana_preconfigure/vars/RedHat_6.5.yml
 rm -f  sap_hana_preconfigure/vars/RedHat_6.6.yml
 rm -f  sap_hana_preconfigure/vars/RedHat_6.7.yml
-rm -f  sap_hana_preconfigure/vars/SLES_15.yml
 popd
 
 %build
-sh md2html.sh \
+%if %{with html}
-%{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_general_preconfigure/README.md \
+readmes=""
-%{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_hana_preconfigure/README.md \
-%{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_netweaver_preconfigure/README.md
-
-for role in %{rolename1} %{rolename2} %{rolename3} %{rolename4} ; do
-    new_role="$(echo ${role/sap-/} | tr '-' '_')"
-    python3 lsr_role2collection.py --role "$role" \
-        --src-path %{github_repo_sap_install}-%{commit_id_sap_install}/roles/"$role" \
-        --src-owner %{src_owner} \
-        --dest-path .collections \
-        --readme %{SOURCE4} \
-        --namespace %{collection_namespace} \
-        --collection %{collection_name} \
-        --new-role "$new_role" \
-        --extra-mapping "timesync:redhat.rhel_system_roles.timesync,storage:redhat.rhel_system_roles.storage,sap-preconfigure:sap.rhel.preconfigure,sap-hana-preconfigure:sap.rhel.hana_preconfigure,sap-netweaver-preconfigure:sap.rhel.netweaver_preconfigure" 
-done
-
-rm -f .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/sanity/ignore-2.9.txt
-# Merge .sanity-ansible-ignore-2.9-ROLENAME.txt into tests/sanity/ignore-2.9.txt
 for role in %{rolenames}; do
-    if [ -f .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.sanity-ansible-ignore-2.9-"$role".txt ];
+    readmes="${readmes} %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md"
-    then
-      cat .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.sanity-ansible-ignore-2.9-"$role".txt \
-        >> .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/sanity/ignore-2.9.txt
-      rm -f .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.sanity-ansible-ignore-*-"$role".txt
-    fi
 done
+sh md2html.sh $readmes
+%endif
 
-# removing dot files/dirs
+# create dest-path
-rm -rf .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.[A-Za-z]*
+mkdir .collections
+
+for role in %{rolenames} ; do
+LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 lsr_role2collection.py --role "$role" \
+    --src-path %{github_repo_sap_install}-%{commit_id_sap_install}/roles/"$role" \
+    --src-owner %{src_owner} \
+    --dest-path .collections \
+    --readme %{SOURCE4} \
+    --namespace %{collection_namespace} \
+    --collection %{collection_name} \
+    --new-role "$new_role"
+done
 
 cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name}
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles \
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles
-         $RPM_BUILD_ROOT%{_pkgdocdir}/sap_hana_preconfigure \
-         $RPM_BUILD_ROOT%{_pkgdocdir}/sap_general_preconfigure \
-         $RPM_BUILD_ROOT%{_pkgdocdir}/sap_netweaver_preconfigure \
-         $RPM_BUILD_ROOT%{_pkgdocdir}/sap_hana_install
 
-pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/
+# create file selection for documents
-for f in sap_hana_preconfigure sap_general_preconfigure sap_netweaver_preconfigure sap_hana_install ; do
+echo "%dir %{_pkgdocdir}" > files_section.txt
-  cp -pR $f $RPM_BUILD_ROOT%{_datadir}/ansible/roles/
+for role in %{rolenames} ; do
-  install -m 644 ../LICENSE $f/README.md $RPM_BUILD_ROOT%{_pkgdocdir}/$f
+    mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/$role
+    cp -pR %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role $RPM_BUILD_ROOT%{_datadir}/ansible/roles/
+    install -m 644 %{github_repo_sap_install}-%{commit_id_sap_install}/LICENSE \
+        %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md \
+        $RPM_BUILD_ROOT%{_pkgdocdir}/$role/
+%if %{with html}
+install -m 644 %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.html \
+    $RPM_BUILD_ROOT%{_pkgdocdir}/$role/
+%endif
+    echo "%dir %{_pkgdocdir}/$role" >> files_section.txt
 done
-popd
 
 # install collection files
 pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
@@ -229,15 +219,13 @@ mv %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz $RPM_
 popd
 %endif
 
-%files
+%files -f files_section.txt
-%dir %{_pkgdocdir}
-%dir %{_pkgdocdir}/sap_general_preconfigure
-%dir %{_pkgdocdir}/sap_hana_preconfigure
-%dir %{_pkgdocdir}/sap_netweaver_preconfigure
-%dir %{_pkgdocdir}/sap_hana_install
 %dir %{_datadir}/ansible
 %dir %{_datadir}/ansible/roles
 %doc %{_pkgdocdir}/*/README.md
+%if %{with html}
+%{_pkgdocdir}/*/README.html
+%endif
 %license %{_pkgdocdir}/*/LICENSE
 %{_datadir}/ansible/roles/*
 %{ansible_collection_files}
@@ -248,14 +236,32 @@ popd
 %endif
 
 %changelog
+* Fri Jul 15 2022 Than Ngo <than@redhat.com> - 3.3.0-3
+- update galaxy.yml and README.md and url
+Related: #2103633
+
+* Tue Jul 12 2022 Than Ngo <than@redhat.com> - 3.3.0-2
+- make the role Ansible 2.13 compliant
+- get rid of all the new ansible-lint 6.3.0 errors for preconfigure and sap_hana_install roles
+Resolves: #2103633
+
+* Mon Jul 04 2022 Than Ngo <than@redhat.com> - 3.3.0-1
+- Resolves: #2103633, include roles for setting up a two-node SAP HANA pacemaker cluster
+
+
+* Thu Jun 09 2022 Than Ngo <than@redhat.com> - 3.2.0-3
+- sap_hana_preconfigure: Add vars for RHEL 9.1 managed nodes
+- sap_general_preconfigure: fix variable inclusion for RHEL minor releases
+Related: #2063050
+
 * Wed Jun 08 2022 Than Ngo <than@redhat.com> - 3.2.0-2
 - sap_general_preconfigure: do not attempt to enable HANA repos for s390x
 - sap_hana_preconfigure: using wrong variable name
 - sap_hana_preconfigure: Fix issue sap-linuxlab#154
-Related: #2066255
+Related: #2063050
 
 * Mon Mar 21 2022 Than Ngo <than@redhat.com> - 3.2.0-1
-- Resolves: #2066255, rebase to new upstream org sap-linuxlab
+- Resolves: #2063050, rebase to new upstream org sap-linuxlab
 
 * Fri Dec 03 2021 Than Ngo <than@redhat.com> - 3.1.1-10
 - Related: #2016858, increase release to avoid update conflict