import rhel-system-roles-sap-3.1.1-4.el8

2021-10-06 14:32:21 -04:00 · 2021-10-06 14:32:21 -04:00 · 71c2db57f6
parent 6ac1950058
commit 71c2db57f6
9 changed files with 642 additions and 32 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
-SOURCES/sap-hana-preconfigure.tar.gz
-SOURCES/sap-netweaver-preconfigure.tar.gz
-SOURCES/sap-preconfigure.tar.gz
+SOURCES/auto-maintenance-ec364d2e0bd422b69f34871a1188114f368097a0.tar.gz
+SOURCES/sap-hana-preconfigure-9f22b540bc41e2d10fbc1250b36a7ef08129feb2.tar.gz
+SOURCES/sap-netweaver-preconfigure-337ba5580ba862e1adac59dcda8a126cdf561225.tar.gz
+SOURCES/sap-preconfigure-9bed558b55cedc8939f6b3d4436436a6aaaf095c.tar.gz
--- a/.rhel-system-roles-sap.metadata
+++ b/.rhel-system-roles-sap.metadata
@ -1,3 +1,4 @@
-2a6d0af7d9ee7fdd8501e52476f9b42c54e3a50c SOURCES/sap-hana-preconfigure.tar.gz
-65265d647f2e65227aa54e5173ef8c29b11d6764 SOURCES/sap-netweaver-preconfigure.tar.gz
-2b1fd31c00102824db00626a95f3f64dc5813983 SOURCES/sap-preconfigure.tar.gz
+bfd618e94056a68c75de22dfcde7b29445850176 SOURCES/auto-maintenance-ec364d2e0bd422b69f34871a1188114f368097a0.tar.gz
+91e5bb8f301a95c289cb1464477ffa4efb4755f8 SOURCES/sap-hana-preconfigure-9f22b540bc41e2d10fbc1250b36a7ef08129feb2.tar.gz
+aee8838be13eb656116dfe7e73146fbbb557f6cd SOURCES/sap-netweaver-preconfigure-337ba5580ba862e1adac59dcda8a126cdf561225.tar.gz
+0ce21e34b45d2d57231d7a48c588295ad464b73f SOURCES/sap-preconfigure-9bed558b55cedc8939f6b3d4436436a6aaaf095c.tar.gz
--- a/SOURCES/README.md
+++ b/SOURCES/README.md
@ -0,0 +1,52 @@
+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.
+
+## Dependencies
+
+If installing from RPM, any dependencies will be installed with the package.
+Otherwise, the dependencies are listed in `requirements.txt` and/or `bindep.txt`.
+
+## Installation
+
+There are currently two ways to use the Red Hat Enterprise Linux System Roles for SAP Collection in your setup.
+
+### Installation from Automation Hub
+
+You can install the collection from Automation Hub by running:
+```
+ansible-galaxy collection install sap.rhel
+```
+
+After the installation, the roles are available as `sap.rhel.<role_name>`.
+
+Please see the [Using Ansible collections documentation](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for further details.
+
+### Installation via RPM
+
+You can install the collection with the software package management tool `dnf` by running:
+```
+dnf install rhel-system-roles-sap
+```
+
+## Documentation
+The official RHEL System Roles for SAP documentation can be found [here](https://access.redhat.com/articles/4488731).
+
+## Support
+
+### Supported Ansible Versions
+
+The supported Ansible versions are aligned with currently maintained Ansible versions that support Collections (Ansible 2.9 and later). You can find the list of maintained Ansible versions [here](https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#release-status).
+
+### Modules and Plugins
+
+The modules and other plugins in this collection are private, used only internally to the collection, unless otherwise noted.
+
+### Supported Roles
+
+<!--ts-->
+  * preconfigure
+  * hana_preconfigure
+  * netweaver_preconfigure
+<!--te-->
--- a/SOURCES/galaxy.yml
+++ b/SOURCES/galaxy.yml
@ -0,0 +1,58 @@
+### REQUIRED
+
+# 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: sap
+
+# The name of the collection. Has the same character restrictions as 'namespace'
+name: rhel
+
+# The version of the collection. Must be compatible with semantic versioning
+version: 3.1.1
+
+# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
+readme: README.md
+
+# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
+# @nicks:irc/im.site#channel'
+authors:
+- Bernd Finger <bfinger@redhat.com>
+- Markus Koch <mkoch@redhat.com>
+
+### OPTIONAL but strongly recommended
+
+# A short summary description of the collection
+description: Ansible Collection to prepare a RHEL 7.6 or later system for the installation of SAP NetWeaver or SAP HANA
+
+# 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'
+license:
+- GPL-3.0-or-later
+- Apache-2.0
+
+# The path to the license file for the collection. This path is relative to the root of the collection. This key is
+# mutually exclusive with 'license'
+# license_file: ''
+
+# 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]
+
+# 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
+# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
+# range specifiers can be set and are separated by ','
+dependencies: {}
+
+# The URL of the originating SCM repository
+repository: https://github.com/sap-linux-roles/sap-linux-roles.github.io/
+
+# The URL to any online docs
+documentation: https://github.com/sap-linux-roles/sap-linux-roles.github.io/blob/master/README.md
+
+# The URL to the homepage of the collection/project
+homepage: https://sap-linux-roles.github.io
+
+# The URL to the collection issue tracker
+issues: https://github.com/sap-linux-roles/sap-linux-roles.github.io/issues
--- a/SOURCES/sap-hana-preconfigure-f30be1952fe55cc4a5e153bfd13863f527643d40.patch
+++ b/SOURCES/sap-hana-preconfigure-f30be1952fe55cc4a5e153bfd13863f527643d40.patch
@ -0,0 +1,185 @@
+commit f30be1952fe55cc4a5e153bfd13863f527643d40
+Author: Bernd Finger <bfinger@redhat.com>
+Date:   Wed Aug 11 21:38:45 2021 +0200
+
+    Solve issues #177, #193, and #194.
+
+diff --git a/tasks/RedHat/generic/assert-tsx.yml b/tasks/RedHat/generic/assert-tsx.yml
+index 4ace64c..d7da1d2 100644
+--- a/tasks/RedHat/generic/assert-tsx.yml
+++ b/tasks/RedHat/generic/assert-tsx.yml
+@@ -4,6 +4,24 @@
+     msg: "imported RedHat/generic/assert-tsx.yml"
+ 
+ - block:
+# There are CPUs which are not capable of enabling the rtm flag, so we just report the status:
+    - name: Get all CPU flags
+      shell: lscpu | grep "^Flags:"
+      register: __sap_hana_preconfigure_register_lscpu_flags
+      changed_when: no
+
+    - name: Report that the rtm CPU flag exists
+      debug:
+        msg: "INFO: The CPU flags contain ' rtm'."
+      when: "' rtm' in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+
+    - name: Report that the rtm CPU flag does not exist
+      debug:
+        msg: "INFO: The CPU flags do not contain ' rtm'."
+      when: "' rtm' not in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+
+# Note: Assertions are only necessary if rtm is not in the CPU flags.
+#       If rtm is present, we just print an INFO message.
+     - name: Get contents of GRUB_CMDLINE_LINUX in /etc/default/grub
+       command: grep GRUB_CMDLINE_LINUX /etc/default/grub
+       register: __sap_hana_preconfigure_register_default_grub_cmdline_tsx_assert
+@@ -15,6 +33,21 @@
+         fail_msg: "FAIL: 'tsx=on' is not in GRUB_CMDLINE_LINUX in /etc/default/grub!"
+         success_msg: "PASS: 'tsx=on' is in GRUB_CMDLINE_LINUX in /etc/default/grub."
+       ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors|d(false) }}"
+      when: "' rtm' not in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+
+    - name: Report if tsx=on is in GRUB_CMDLINE_LINUX in /etc/default/grub
+      debug:
+        msg: "INFO: 'tsx=on' is in GRUB_CMDLINE_LINUX in /etc/default/grub."
+      when:
+        - "'tsx=on' in __sap_hana_preconfigure_register_default_grub_cmdline_tsx_assert.stdout"
+        - "' rtm' in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+
+    - name: Report if tsx=on is not in GRUB_CMDLINE_LINUX in /etc/default/grub
+      debug:
+        msg: "INFO: 'tsx=on' is not in GRUB_CMDLINE_LINUX in /etc/default/grub."
+      when:
+        - "'tsx=on' not in __sap_hana_preconfigure_register_default_grub_cmdline_tsx_assert.stdout"
+        - "' rtm' in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+ 
+     - name: Get contents of /proc/cmdline
+       command: cat /proc/cmdline
+@@ -27,20 +60,21 @@
+         fail_msg: "FAIL: 'tsx=on' is not in /proc/cmdline!"
+         success_msg: "PASS: 'tsx=on' is in /proc/cmdline."
+       ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors|d(false) }}"
+      when: "' rtm' not in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+ 
+-# We are counting the number of cpuinfo lines which contain "flags" and subtracting those lines
+-#   which contain "flags" and " rtm ". If the result is 0, all CPUs contain flag "rtm".
+-    - name: Get rtm status of all CPUs
+-      shell: awk '$1=="flags"{n++}$1=="flags"&&$0~" rtm" {a++}END{print n-a}' /proc/cpuinfo
+-      register: __sap_hana_preconfigure_register_cpuinfo_flags_contain_rtm
+-      changed_when: no
+    - name: Report if tsx=on is in /proc/cmdline
+      debug:
+        msg: "INFO: 'tsx=on' is in /proc/cmdline."
+      when:
+        - "'tsx=on' in __sap_hana_preconfigure_register_proc_cmdline_tsx_assert.stdout"
+        - "' rtm' in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+ 
+-    - name: Assert that all CPUs contain flag rtm
+-      assert:
+-        that: "__sap_hana_preconfigure_register_cpuinfo_flags_contain_rtm.stdout == '0'"
+-        fail_msg: "FAIL: At least one of the CPUs does not contain flag 'rtm'!"
+-        success_msg: "PASS: All CPUs contain flag 'rtm'."
+-      ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors|d(false) }}"
+    - name: Report if tsx=on is not in /proc/cmdline
+      debug:
+        msg: "INFO: 'tsx=on' is not in /proc/cmdline."
+      when:
+        - "'tsx=on' not in __sap_hana_preconfigure_register_proc_cmdline_tsx_assert.stdout"
+        - "' rtm' in __sap_hana_preconfigure_register_lscpu_flags.stdout"
+ 
+   when: ansible_architecture == 'x86_64' and
+         ansible_distribution == 'RedHat' and
+diff --git a/tasks/RedHat/generic/enable-tsx.yml b/tasks/RedHat/generic/enable-tsx.yml
+index 879f0bf..3dd6d09 100644
+--- a/tasks/RedHat/generic/enable-tsx.yml
+++ b/tasks/RedHat/generic/enable-tsx.yml
+@@ -3,7 +3,16 @@
+ - debug:
+     msg: "imported RedHat/generic/enable-tsx.yml"
+ 
+-- name: Enable TSX at boot time
+- name: Get the CPU flags
+  shell: lscpu | grep "^Flags"
+  register: __sap_hana_preconfigure_register_lscpu
+  when:
+    - ansible_architecture == 'x86_64'
+    - ansible_distribution == 'RedHat'
+    - ansible_distribution_major_version == '8'
+    - __sap_hana_preconfigure_fact_ansible_distribution_minor_version >= '3'
+
+- name: Enable TSX at boot time if CPU flag rtm is not present
+   lineinfile:
+     path: /etc/default/grub
+     backup: yes
+@@ -14,10 +23,12 @@
+   with_items:
+      - "tsx=on"
+   notify: __sap_hana_preconfigure_regenerate_grub2_conf_handler
+-  when: ansible_architecture == 'x86_64' and
+-        ansible_distribution == 'RedHat' and
+-        ansible_distribution_major_version == '8' and
+-        __sap_hana_preconfigure_fact_ansible_distribution_minor_version >= '3'
+  when:
+    - ansible_architecture == 'x86_64'
+    - ansible_distribution == 'RedHat'
+    - ansible_distribution_major_version == '8'
+    - __sap_hana_preconfigure_fact_ansible_distribution_minor_version >= '3'
+    - not ' rtm' in __sap_hana_preconfigure_register_lscpu.stdout
+   tags: grubconfig
+   loop_control:
+     loop_var: line_item
+diff --git a/tasks/RedHat/installation.yml b/tasks/RedHat/installation.yml
+index fabeaac..a5bdb94 100644
+--- a/tasks/RedHat/installation.yml
+++ b/tasks/RedHat/installation.yml
+@@ -63,22 +63,19 @@
+     - ansible_architecture == "ppc64le"
+     - sap_hana_preconfigure_add_ibm_power_repo|d(true)
+ 
+-- name: Accept the license for the IBM tools
+-  shell: |
+-    MORE=+1000 /opt/ibm/lop/configure <<-EOF
+-    y
+-    EOF
+- name: Accept the license for the IBM Service and Productivity Tools
+  shell: LESS=+q /opt/ibm/lop/configure <<<'y'
+   when:
+     - ansible_architecture == "ppc64le"
+     - sap_hana_preconfigure_add_ibm_power_repo|d(true)
+ 
+-- name: Install IBM tools
+- name: Install the IBM Service and Productivity Tools
+   package:
+     state: latest
+     name: "{{ __sap_hana_preconfigure_required_ppc64le }}"
+   when: ansible_architecture == "ppc64le"
+ 
+-- name: Get status of installed IBM tools
+- name: Get the status of installed IBM Service and Productivity Tools
+   yum:
+     name: "{{ __sap_hana_preconfigure_required_ppc64le }}"
+   register: __sap_hana_preconfigure_register_required_ppc64le_packages
+diff --git a/tasks/sapnote/2055470.yml b/tasks/sapnote/2055470.yml
+index 5efbd6d..697913c 100644
+--- a/tasks/sapnote/2055470.yml
+++ b/tasks/sapnote/2055470.yml
+@@ -32,7 +32,7 @@
+     loop_var: line_item
+ 
+ ## This only works if interfacename=device name, otherwise it fails 
+-- name: add largesend options to interface
+- name: Add largesend options to interfaces
+   lineinfile:
+     regexp: '^ETHTOOL_OPTIONS_tso='
+     line: ETHTOOL_OPTIONS_tso='-K iface tso on'
+@@ -45,8 +45,9 @@
+         )
+   loop_control:
+     loop_var: line_item
+  ignore_errors: true
+ 
+-- name: Add largesend parameters for ppc64le
+- name: Add largesend kernel parameters for ppc64le
+   sysctl:
+     sysctl_file: /etc/sysctl.d/ibm_largesend.conf
+     name: "{{ line_item.name }}"
--- a/SOURCES/sap-hana-preconfigure-md2html-error.patch
+++ b/SOURCES/sap-hana-preconfigure-md2html-error.patch
@ -0,0 +1,19 @@
+diff -up sap-hana-preconfigure/README.md.me sap-hana-preconfigure/README.md
+--- 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
+@@ -216,13 +216,13 @@ In case you want the role to set or chec
+ sap_hana_preconfigure_use_netapp_settings_nfsv3
+ ```
+ 
+-### Add the repository for IBM service and productivity tools for POWER (ppc64le only)
+### Add the repository for IBM service and productivity tools (ppc64le only)
+ In case you do *not* want to automatically add the repository for the IBM service and productivity tools, set the following variable to `no`. Default is `yes`, meaning that the role will download and install the package specified in variable sap_hana_preconfigure_ibm_power_repo_url (see below) and also run the command /opt/ibm/lop/configure to accept the license.
+ ```yaml
+ sap_hana_preconfigure_add_ibm_power_repo
+ ```
+ 
+-### URL for IBM service and productivity tools for POWER (ppc64le only)
+### URL for IBM service and productivity tools (ppc64le only)
+ The following variable is set to the location of package ibm-power-repo-lastest.noarch.rpm or a package with similar contents, as defined by variable __sap_hana_preconfigure_ibm_power_repo_url in vars/RedHat_7.yml and vars/RedHat_8.yml.
+ You can replace it by your own URL by setting this variable to a different URL.
+ ```yaml
--- a/SOURCES/sap-netweaver-preconfigure-rhel9.patch
+++ b/SOURCES/sap-netweaver-preconfigure-rhel9.patch
@ -0,0 +1,57 @@
+diff -up sap-netweaver-preconfigure/tasks/main.yml.me sap-netweaver-preconfigure/tasks/main.yml
+--- sap-netweaver-preconfigure/tasks/main.yml.me	2021-07-16 20:47:31.917915614 +0200
+++ sap-netweaver-preconfigure/tasks/main.yml	2021-07-16 20:49:14.545505014 +0200
+@@ -7,7 +7,7 @@
+ - name: Include os specific vars
+   include_vars: '{{ item }}'
+   with_first_found:
+-    - '{{ ansible_distibution }}_{{ ansible_distribution_version }}.yml'
+    - '{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml'
+     - '{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml'
+     - '{{ ansible_os_family }}.yml'
+ 
+diff -up sap-netweaver-preconfigure/vars/RedHat_9.yml.me sap-netweaver-preconfigure/vars/RedHat_9.yml
+--- sap-netweaver-preconfigure/vars/RedHat_9.yml.me	2021-07-16 20:47:58.990334885 +0200
+++ sap-netweaver-preconfigure/vars/RedHat_9.yml	2021-07-16 20:48:15.158585284 +0200
+@@ -0,0 +1,41 @@
+---
+
+# vars file for sap-netweaver-preconfigure
+
+__sap_netweaver_preconfigure_sapnotes:
+  - "2526952"
+
+__sap_netweaver_preconfigure_packages:
+  - tuned-profiles-sap
+
+__sap_netweaver_preconfigure_min_swap_space_mb: '20480'
+
+__sap_netweaver_preconfigure_adobe_doc_services_packages:
+  - autoconf.noarch
+  - automake.noarch
+  - cyrus-sasl.x86_64
+  - expat.x86_64
+  - fontconfig.x86_64
+  - glibc-devel.i686
+  - keyutils-libs.x86_64
+  - krb5-libs.x86_64
+  - libcom_err.x86_64
+  - libidn2.x86_64
+  - libselinux.x86_64
+  - libssh2.x86_64
+  - libxcb.i686
+  - nspr.x86_64
+  - nss.x86_64
+  - nss-softokn.x86_64
+  - nss-softokn-freebl.x86_64
+  - nss-util.x86_64
+  - openldap.x86_64
+  - openssl.x86_64
+  - zlib.x86_64
+  - libstdc++.i686
+  - libX11.i686
+  - libXau.i686
+  - glibc.i686
+  - libstdc++.i686
+  - libgcc.i686
+  - libuuid.i686
--- a/SOURCES/sap-preconfigure-69de334fecbce65506bbea15b1b9bcd643528352.patch
+++ b/SOURCES/sap-preconfigure-69de334fecbce65506bbea15b1b9bcd643528352.patch
@ -0,0 +1,29 @@
+commit 69de334fecbce65506bbea15b1b9bcd643528352
+Author: Bernd Finger <bfinger@redhat.com>
+Date:   Wed Aug 11 21:50:14 2021 +0200
+
+    Solve issue #149
+
+diff --git a/tasks/installation.yml b/tasks/installation.yml
+index 7dbab15..096c993 100644
+--- a/tasks/installation.yml
+++ b/tasks/installation.yml
+@@ -1,9 +1,15 @@
+ ---
+ 
+ - name: Ensure required package groups are installed
+-  package:
+-    state: present
+-    name: "{{ sap_preconfigure_packagegroups }}"
+# Note: We cannot use the package module here as this will do a default group install,
+#   which could lead to unwanted package upgrades. See bug 1983749.
+  command: yum install "{{ sap_preconfigure_packagegroups|join('')|quote }}" --skip-broken --exclude="kernel*" -y
+  args:
+    warn: false
+  register: __sap_preconfigure_register_yum_group_install
+
+- debug:
+    var: __sap_preconfigure_register_yum_group_install
+ 
+ - name: Ensure required packages are installed
+   package:
--- a/SPECS/rhel-system-roles-sap.spec
+++ b/SPECS/rhel-system-roles-sap.spec
@ -1,44 +1,209 @@
-Name: rhel-system-roles-sap
+%if 0%{?rhel} && ! 0%{?epel}
+%bcond_with ansible
+%else
+%bcond_without ansible
+%endif
+
+%bcond_with collection_artifact
+
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_without html
+%else
+# pandoc is not supported in rhel 7 and older,
+# which is needed for converting .md to .html.
+%bcond_with html
+%endif
+
+%global collection_namespace sap
+%if 0%{?rhel}
+%define package_name rhel-system-roles-sap
+%global collection_name rhel
+%else
+%define package_name linux-system-roles-sap
+%global collection_name linux
+%endif
+
+%global mainid ec364d2e0bd422b69f34871a1188114f368097a0
+%global gitcommit_sap 9bed558b55cedc8939f6b3d4436436a6aaaf095c
+%global gitcommit_sap_hana 9f22b540bc41e2d10fbc1250b36a7ef08129feb2
+%global gitcommit_sap_netweaver 337ba5580ba862e1adac59dcda8a126cdf561225
+%global rolename1 sap-preconfigure
+%global rolename2 sap-hana-preconfigure
+%global rolename3 sap-netweaver-preconfigure
+%global src_owner linux-system-roles
+
+Name: %{package_name}
 Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
-Version: 3.0.1
-Release: 2%{?dist}
+Version: 3.1.1
+Release: 4%{?dist}
 License: GPLv3+
 Url: https://github.com/berndfinger
-Source0: https://github.com/berndfinger/sap-preconfigure/releases/download/3.0.1/sap-preconfigure.tar.gz
-Source1: https://github.com/berndfinger/sap-hana-preconfigure/releases/download/3.0.1/sap-hana-preconfigure.tar.gz
-Source2: https://github.com/berndfinger/sap-netweaver-preconfigure/releases/download/3.0.1/sap-netweaver-preconfigure.tar.gz
+Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
+Source1: https://github.com/berndfinger/sap-preconfigure/archive/%{gitcommit_sap}/sap-preconfigure-%{gitcommit_sap}.tar.gz
+Source2: https://github.com/berndfinger/sap-hana-preconfigure/archive/%{gitcommit_sap_hana}/sap-hana-preconfigure-%{gitcommit_sap_hana}.tar.gz
+Source3: https://github.com/berndfinger/sap-netweaver-preconfigure/archive/%{gitcommit_sap_netweaver}/sap-netweaver-preconfigure-%{gitcommit_sap_netweaver}.tar.gz
+Source4: README.md
+Source5: galaxy.yml
 # patches 0-49 for sap-preconfigure
+Patch1: sap-preconfigure-69de334fecbce65506bbea15b1b9bcd643528352.patch
 # patches 50-99 for sap-hana-preconfigure
+Patch50: sap-hana-preconfigure-md2html-error.patch
+Patch51: sap-hana-preconfigure-f30be1952fe55cc4a5e153bfd13863f527643d40.patch
 # patches 100-149 for sap-netweaver-preconfigur
+Patch100: sap-netweaver-preconfigure-rhel9.patch

 BuildArch: noarch
-Requires: uuidd
+
+
+%if %{with html}
+# Requirements for md2html.sh to build the documentation
+%if 0%{?fedora} || 0%{?rhel} >= 9
+BuildRequires: rubygem-kramdown-parser-gfm
+%else
+BuildRequires: pandoc
+BuildRequires: asciidoc
+BuildRequires: highlight
+%endif
+%endif
+
+# Requirements for galaxy_transform.py
+BuildRequires: python3
+%if 0%{?fedora} || 0%{?rhel} >= 8
+BuildRequires: python3dist(ruamel.yaml)
+Requires: python3-jmespath
+Requires: python3-netaddr
+%else
+BuildRequires: python3-ruamel-yaml
+Requires: python-jmespath
+Requires: python-netaddr
+%endif
+
+%if %{with ansible}
+BuildRequires: ansible >= 2.9.10
+%endif
+
+%global collection_version %{version}
+
+%if %{undefined __ansible_provides}
+Provides: ansible-collection(%{collection_namespace}.%{collection_name}) = %{collection_version}
+%endif
+# be compatible with the usual Fedora Provides:
+Provides: ansible-collection-%{collection_namespace}-%{collection_name} = %{version}-%{release}
+
+%{!?ansible_collection_files:%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/}
+%if %{undefined ansible_collection_build}
+%if %{without ansible}
+# Empty command. We don't have ansible-galaxy.
+%define ansible_collection_build() :
+%else
+%define ansible_collection_build() ansible-galaxy collection build
+%endif
+%endif
+
+%if %{undefined ansible_collection_install}
+%if %{without ansible}
+# Simply copy everything instead of galaxy-installing the built artifact.
+%define ansible_collection_install() mkdir -p %{buildroot}%{ansible_collection_files}; cp -a . %{buildroot}%{ansible_collection_files}/%{collection_name}/
+%else
+%define ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz
+%endif
+%endif

 %description
 Collection of Ansible roles which configures a RHEL system according
 to applicable SAP notes so that any SAP software can be installed.

+%if %{with collection_artifact}
+%package collection-artifact
+Summary: Collection artifact to import to Automation Hub / Ansible Galaxy
+
+%description collection-artifact
+Collection artifact for %{name}. This package contains %{collection_namespace}-%{collection_name}-%{version}.tar.gz
+%endif
+
 %prep
-%setup -q -T -c -n %{name}-%{version} -a 0 -a 1 -a 2
+%setup -q -a1 -a2 -a3 -n auto-maintenance-%{mainid}

-# remove all SLES stuff
-rm -rf sap-hana-preconfigure/tasks/SLES
-rm -rf sap-hana-preconfigure/tasks/SLES15
-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 -rf sap-hana-preconfigure/tasks/sapnote/2578899  # SLES 15 - installation
-rm -rf sap-hana-preconfigure/tasks/sapnote/2684254  # SLES 15 - OS settings for HANA
-rm -f sap-hana-preconfigure/vars/SLES_15.yml
+# rename the source directories without gitcommit_sap 
+mv sap-preconfigure-%{gitcommit_sap} sap-preconfigure
+mv sap-hana-preconfigure-%{gitcommit_sap_hana} sap-hana-preconfigure
+mv sap-netweaver-preconfigure-%{gitcommit_sap_netweaver} sap-netweaver-preconfigure

-# remove all RHEL 6 stuff
-rm -f sap-hana-preconfigure/tasks/sapnote/2013638.yml # RHEL 6.5 - OS settings
-rm -f sap-hana-preconfigure/tasks/sapnote/2136965.yml # RHEL 6.6 - OS settings
-rm -f sap-hana-preconfigure/tasks/sapnote/2247020.yml # RHEL 6.7 - OS settings
-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
+# cp own galaxy.yml and rename the collection name correctly for Automation Hub and Galaxy
+mkdir .collections
+cp %{SOURCE5} galaxy.yml
+sed -i -e 's|name: rhel|name: %{collection_name}|' galaxy.yml
+
+
+pushd sap-preconfigure
+%patch1 -p1
+popd
+pushd sap-hana-preconfigure
+%patch50 -p1
+%patch51 -p1
+popd
+pushd sap-netweaver-preconfigure
+%patch100 -p1
+popd
+
+# remove git stuff
+rm -rf *-preconfigure/.git*
+# 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 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
+rm -f  sap-hana-preconfigure/tasks/sapnote/2013638.yml # RHEL 6.5 - OS settings
+rm -f  sap-hana-preconfigure/tasks/sapnote/2136965.yml # RHEL 6.6 - OS settings
+rm -f  sap-hana-preconfigure/tasks/sapnote/2247020.yml # RHEL 6.7 - OS settings
+rm -rf sap-hana-preconfigure/tasks/sapnote/2578899 # SLES 15 - installation
+rm -rf sap-hana-preconfigure/tasks/sapnote/2684254 # SLES 15 - OS settings for HANA
+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

 %build
+sh md2html.sh \
+sap-preconfigure/README.md \
+sap-hana-preconfigure/README.md \
+sap-netweaver-preconfigure/README.md
+
+for role in %{rolename1} %{rolename2} %{rolename3} ; do
+    new_role="$(echo ${role/sap-/} | tr '-' '_')"
+    python3 lsr_role2collection.py --role "$role" \
+        --src-path "$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 ];
+    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
+
+# removing dot files/dirs
+rm -rf .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.[A-Za-z]*
+
+cp -p galaxy.yml lsr_role2collection/.ansible-lint \
+    .collections/ansible_collections/%{collection_namespace}/%{collection_name}
+
+# build collection file
+cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
+%ansible_collection_build

 %install
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles \
@ -46,14 +211,27 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles \
         $RPM_BUILD_ROOT%{_pkgdocdir}/sap-preconfigure \
         $RPM_BUILD_ROOT%{_pkgdocdir}/sap-netweaver-preconfigure

-# drop zero file
-rm -f */.gitignore sap-hana-preconfigure/tasks/RedHat_6/recommendations.yml
-
 cp -pR sap-hana-preconfigure sap-preconfigure sap-netweaver-preconfigure $RPM_BUILD_ROOT%{_datadir}/ansible/roles/
 cp -p sap-hana-preconfigure/{README.md,LICENSE} $RPM_BUILD_ROOT%{_pkgdocdir}/sap-hana-preconfigure/
 cp -p sap-preconfigure/{README.md,LICENSE} $RPM_BUILD_ROOT%{_pkgdocdir}/sap-preconfigure/
 cp -p sap-netweaver-preconfigure/{README.md,LICENSE} $RPM_BUILD_ROOT%{_pkgdocdir}/sap-netweaver-preconfigure/

+# install collection files
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
+%ansible_collection_install
+popd
+
+# install collection_artifact
+%if %{with collection_artifact}
+# Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
+if [ -f %{collection_namespace}-%{collection_name}-%{version}.tar.gz ]; then
+    mv %{collection_namespace}-%{collection_name}-%{version}.tar.gz \
+       $RPM_BUILD_ROOT%{_datadir}/ansible/collections/
+fi
+popd
+%endif
+
 %files
 %dir %{_pkgdocdir}
 %dir %{_pkgdocdir}/sap-preconfigure
@ -64,8 +242,38 @@ cp -p sap-netweaver-preconfigure/{README.md,LICENSE} $RPM_BUILD_ROOT%{_pkgdocdir
 %doc %{_pkgdocdir}/*/README.md
 %license %{_pkgdocdir}/*/LICENSE
 %{_datadir}/ansible/roles/*
+%{ansible_collection_files}
+
+%if %{with collection_artifact}
+%files collection-artifact
+%{_datadir}/ansible/collections/%{collection_namespace}-%{collection_name}-%{version}.tar.gz
+%endif

 %changelog
+* Fri Aug 20 2021 Than Ngo <than@redhat.com> - 3.1.1-4
+- Related: #1928398, fix #149, #177, #193, #194
+
+* Mon Jul 12 2021 Than Ngo <than@redhat.com> - 3.1.1-3
+- add missing __sap_preconfigure_envgroups for RHEL 7.x
+- add __sap_hana_preconfigure_req_repos variables for RHEL 8.5 and later
+  Related: #1928398
+
+* Thu Jul 01 2021 Than Ngo <than@redhat.com> - 3.1.1-2
+- Related: #1928398, add missing changelogs
+
+* Tue Jun 29 2021 Than Ngo <than@redhat.com> - 3.1.1-1
+- Resolves: #1928398, rebase to 3.1.1 for Ansible Collections
+
+* Fri Mar 05 2021 Than Ngo <than@redhat.com> - 3.0.1-4
+- fixed issue #130 in sap-preconfigure
+- fixed typos in README.md in sap_hana_preconfigure
+- added detailed explanations for sap_hana_preconfigure_kernel_parameters_ppc64le in README.md
+- fixed issue #170 in sap_hana_preconfigure
+  Related: #1891642
+
+* Wed Feb 24 2021 Than Ngo <than@redhat.com> - 3.0.1-3
+- Related: #1891642, fixed issue #125 in sap-preconfigure and #163 and #164 in sap-hana-preconfigure
+
 * Thu Feb 18 2021 Than Ngo <than@redhat.com> - 3.0.1-2
 - Related: #1891642, update sap-hana-preconfigure 3.0.1 and fixed Urls