diff --git a/.gitignore b/.gitignore index 5a6d1c5..b9983f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz -SOURCES/community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f.tar.gz +SOURCES/community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz +SOURCES/prepare-redhat.sap_install-main.tar.bz2 diff --git a/.rhel-system-roles-sap.metadata b/.rhel-system-roles-sap.metadata index 2952a84..6860696 100644 --- a/.rhel-system-roles-sap.metadata +++ b/.rhel-system-roles-sap.metadata @@ -1,2 +1,3 @@ 584f8d1681adf13cb7af256a7b38d94ca80dcab2 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz -831f15e14b4fe7bc152c46f882280ac7db0f52f8 SOURCES/community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f.tar.gz +d991a279d5d4b5a991f229a29d20e772132af519 SOURCES/community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz +017c84ab579375755b104b85d5eb77b26a117a80 SOURCES/prepare-redhat.sap_install-main.tar.bz2 diff --git a/SOURCES/README.md b/SOURCES/README.md deleted file mode 100644 index 13cb4df..0000000 --- a/SOURCES/README.md +++ /dev/null @@ -1,63 +0,0 @@ -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, for installing SAP HANA Scale-Up and Scale-Out, and for installing a SAP HANA Two-Node Scale-Up cluster. - -## 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 redhat.sap_install -``` - -After the installation, the roles are available as `redhat.sap_install.`. - -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. - -### Fully Supported Roles - - - * sap_general_preconfigure - * sap_hana_preconfigure - * sap_netweaver_preconfigure - - - -### Roles in Technology Preview Support - - - * sap_hana_install - * sap_ha_install_hana_hsr - * sap_ha_prepare_pacemaker - * sap_ha_install_pacemaker - * sap_ha_set_hana - diff --git a/SOURCES/galaxy.yml b/SOURCES/galaxy.yml deleted file mode 100644 index 3e58c4e..0000000 --- a/SOURCES/galaxy.yml +++ /dev/null @@ -1,70 +0,0 @@ -### 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: __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.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 (url) -# @nicks:irc/im.site#channel' -authors: -- Bernd Finger -- Sean Freeman -- Rainer Leber -- Markus Koch -- Markus Moster -- Janine Fuchs - -### OPTIONAL but strongly recommended - -# A short summary description of the collection -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' -license: -- 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: -- 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 -# 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-linuxlab/community.sap_install - -# The URL to any online docs -documentation: https://github.com/sap-linuxlab/sap-linuxlab.github.io/blob/master/README.md - -# The URL to the homepage of the collection/project -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-*'] diff --git a/SOURCES/sap-hana-preconfigure-md2html-error.patch b/SOURCES/sap-hana-preconfigure-md2html-error.patch deleted file mode 100644 index f3ace35..0000000 --- a/SOURCES/sap-hana-preconfigure-md2html-error.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up community.sap_install/roles/sap_hana_preconfigure/README.md.me community.sap_install/roles/sap_hana_preconfigure/README.md ---- community.sap_install/roles/sap_hana_preconfigure/README.md.me 2021-03-22 14:08:21.960414814 +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 - ``` - --### 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 diff --git a/SPECS/rhel-system-roles-sap.spec b/SPECS/rhel-system-roles-sap.spec index ee2c83b..a14fd5d 100644 --- a/SPECS/rhel-system-roles-sap.spec +++ b/SPECS/rhel-system-roles-sap.spec @@ -26,27 +26,25 @@ # 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.1.1 +%define collection_version 1.2.1 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0 -%global commit_id_sap_install a2c6785d02092bb9142d9f2c170ad4b097d1af2f +%global commit_id_sap_install f0deb287aaa0fb7d992b95a04b14e263b6690c23 %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 rolename5 sap_ha_pacemaker_cluster %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} +%global rolename_rhel %{rolename1} %{rolename2} %{rolename3} %{rolename4} %{rolename5} %{rolename10} %{rolename11} +%global rolename_community %{rolename_rhel} %{rolename1} %{rolename6} %{rolename7} %{rolename8} %{rolename9} %if 0%{?fedora} %global rolenames %{rolename_community} %else @@ -55,16 +53,15 @@ Name: %{package_name} Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products -Version: 3.3.0 +Version: 3.4.0 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: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/README.md -Source5: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/galaxy.yml +# files/README.md, files/roles/sap_swpm/README.md from https://gitlab.cee.redhat.com/sap-linuxlab/prepare-redhat.sap_install +Source2: prepare-redhat.sap_install-main.tar.bz2 Patch1: community.sap_install-shebang.patch -Patch2: sap-hana-preconfigure-md2html-error.patch BuildArch: noarch @@ -130,16 +127,33 @@ Collection artifact for %{name}. This package contains %{collection_namespace}-% %endif %prep -%setup -q -a1 -n auto-maintenance-%{mainid} +%setup -q -a1 -a2 -n auto-maintenance-%{mainid} # add correct version and namespace for Automation Hub and Galaxy -cp %{SOURCE5} . +cp %{github_repo_sap_install}-%{commit_id_sap_install}/galaxy.yml . sed -i -e "s|^namespace: .*|namespace: %{collection_namespace}|" galaxy.yml sed -i -e "s|^version: .*|version: %{collection_version}|" galaxy.yml +# update README.md and roles/sap_swpm/README.md +cp prepare-redhat.sap_install-main/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/ +cp prepare-redhat.sap_install-main/files/roles/sap_swpm/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_swpm/README.md + pushd %{github_repo_sap_install}-%{commit_id_sap_install}/ +# workaround for md2html error +sed -i -e "s|for POWER ||g" roles/sap_hana_preconfigure/README.md %patch1 -p1 -%patch2 -p1 + +# modify collection-requirements.yml, fedora.linux_system_roles -> redhat.rhel_system_roles +for r in %{rolenames} ; do + yml=roles/${r}/meta/collection-requirements.yml + [ -f ${yml} ] && sed -i "s,fedora.linux_system_roles,redhat.rhel_system_roles," ${yml} +done + +# modify defaults/main.yml, fedora.linux_system_roles -> redhat.rhel_system_roles +for r in %{rolenames} ; do + yml=roles/${r}/defaults/main.yml + [ -f ${yml} ] && sed -i "s,system_roles_collection: 'fedora.linux_system_roles',system_roles_collection: 'redhat.rhel_system_roles'," ${yml} +done popd # remove zero file and symlinks @@ -169,7 +183,7 @@ readmes="" for role in %{rolenames}; do readmes="${readmes} %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md" done -sh md2html.sh $readmes +sh md2html.sh $readmes %{github_repo_sap_install}-%{commit_id_sap_install}/README.md %endif # create dest-path @@ -180,7 +194,6 @@ 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" @@ -189,10 +202,17 @@ 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} # create file selection for documents echo "%dir %{_pkgdocdir}" > files_section.txt +cp %{github_repo_sap_install}-%{commit_id_sap_install}/README.md $RPM_BUILD_ROOT%{_pkgdocdir}/ +%if %{with html} +cp %{github_repo_sap_install}-%{commit_id_sap_install}/README.html $RPM_BUILD_ROOT%{_pkgdocdir}/ +%endif +echo "%{_pkgdocdir}/README.*" >> files_section.txt + for role in %{rolenames} ; do 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/ @@ -236,6 +256,18 @@ popd %endif %changelog +* Mon Jan 30 2023 Than Ngo - 3.4.0-3 +- Related: #2155876, rebase sap roles to version 1.2.1 + +* Thu Jan 19 2023 Than Ngo - 3.4.0-2 +- Related: #2155876, compat-sap-c++-10 is not available for RHEL 8.2 and earlier on hardware platform s390x + +* Wed Jan 11 2023 Than Ngo - 3.4.0-1 +- Resolves: #2155876, rebase sap roles to version 1.2.0 + +* Tue Nov 22 2022 Than Ngo - 3.3.0-4 +- Resolves: #2142957, drop deprecated paramater for Ansible 2.14 + * Fri Jul 15 2022 Than Ngo - 3.3.0-3 - update galaxy.yml and README.md and url Related: #2103633 @@ -248,7 +280,6 @@ Resolves: #2103633 * Mon Jul 04 2022 Than Ngo - 3.3.0-1 - Resolves: #2103633, include roles for setting up a two-node SAP HANA pacemaker cluster - * Thu Jun 09 2022 Than Ngo - 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