rpms/rhel-system-roles-sap
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: #2047282, new rebase, fixed collection basename

Browse Source
This commit is contained in:
Than Ngo 2022-02-22 13:41:39 +01:00
parent 5d6084be7f
commit c4c1e15720
5 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@
/sap-preconfigure-d065073dca5617292d768ea0e044994653f84667.tar.gz /sap-preconfigure-d065073dca5617292d768ea0e044994653f84667.tar.gz
/community.sap_install-7956ecd9bd289c608f6e5c0d51c5139ae9a6d349.tar.gz /community.sap_install-7956ecd9bd289c608f6e5c0d51c5139ae9a6d349.tar.gz
/auto-maintenance-d64d1be7904aa8f279b117da6f2a31b3d4b6e43e.tar.gz /auto-maintenance-d64d1be7904aa8f279b117da6f2a31b3d4b6e43e.tar.gz
/community.sap_install-d8330042de222480c78e040846db8bffe4321cf4.tar.gz

21
README.md
View File

@ -1,7 +1,7 @@
Red Hat Enterprise Linux System Roles for SAP Ansible Collection 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. 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.
## Dependencies ## Dependencies
@ -16,10 +16,10 @@ There are currently two ways to use the Red Hat Enterprise Linux System Roles fo
You can install the collection from Automation Hub by running: You can install the collection from Automation Hub by running:
``` ```
ansible-galaxy collection install sap.rhel ansible-galaxy collection install redhat.sap_install
``` ```
After the installation, the roles are available as `sap.rhel.<role_name>`. After the installation, the roles are available as `redhat.sap_install.<role_name>`.
Please see the [Using Ansible collections documentation](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for further details. Please see the [Using Ansible collections documentation](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for further details.
@ -43,10 +43,17 @@ The supported Ansible versions are aligned with currently maintained Ansible ver
The modules and other plugins in this collection are private, used only internally to the collection, unless otherwise noted. The modules and other plugins in this collection are private, used only internally to the collection, unless otherwise noted.
### Supported Roles ### Fully Supported Roles
<!--ts--> <!--ts-->
* preconfigure * sap_general_preconfigure
* hana_preconfigure * sap_hana_preconfigure
* netweaver_preconfigure * sap_netweaver_preconfigure
<!--te-->
### Roles in Technology Preview Support
<!--ts-->
* sap_hana_install
<!--te--> <!--te-->

20
galaxy.yml
View File

@ -3,13 +3,13 @@
# The namespace of the collection. This can be a company/brand/organization or product namespace under which all # 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 # content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
# underscores or numbers and cannot contain consecutive underscores # underscores or numbers and cannot contain consecutive underscores
namespace: sap-linuxlab namespace: redhat
# The name of the collection. Has the same character restrictions as 'namespace' # The name of the collection. Has the same character restrictions as 'namespace'
name: rhel name: sap_install
# The version of the collection. Must be compatible with semantic versioning # The version of the collection. Must be compatible with semantic versioning
version: 3.2.0 version: 1.0.0
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md readme: README.md
@ -18,18 +18,18 @@ readme: README.md
# @nicks:irc/im.site#channel' # @nicks:irc/im.site#channel'
authors: authors:
- Bernd Finger <bfinger@redhat.com> - Bernd Finger <bfinger@redhat.com>
- Sean Freeman <sean.freeman@uk.ibm.com>
- Rainer Leber <rainer.leber@sva.de>
- Markus Koch <mkoch@redhat.com> - Markus Koch <mkoch@redhat.com>
- Than Ngo <than@redhat.com>
### OPTIONAL but strongly recommended ### OPTIONAL but strongly recommended
# A short summary description of the collection # 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 description: Ansible Collection for installing SAP NetWeaver or SAP HANA on Linux
# Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only # 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' # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
license: license:
- GPL-3.0-or-later
- Apache-2.0 - 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 # The path to the license file for the collection. This path is relative to the root of the collection. This key is
@ -47,13 +47,13 @@ tags: [sap]
dependencies: {} dependencies: {}
# The URL of the originating SCM repository # The URL of the originating SCM repository
repository: https://github.com/sap-linux-roles/sap-linux-roles.github.io/ repository: https://github.com/sap-linuxlab/community.sap_install
# The URL to any online docs # The URL to any online docs
documentation: https://github.com/sap-linux-roles/sap-linux-roles.github.io/blob/master/README.md documentation: https://github.com/sap-linuxlab/sap-linuxlab.github.io/blob/master/README.md
# The URL to the homepage of the collection/project # The URL to the homepage of the collection/project
homepage: https://sap-linux-roles.github.io homepage: https://sap-linuxlab.github.io
# The URL to the collection issue tracker # The URL to the collection issue tracker
issues: https://github.com/sap-linux-roles/sap-linux-roles.github.io/issues issues: https://github.com/sap-linuxlab/community.sap_install/issues

46
rhel-system-roles-sap.spec
View File

@ -14,23 +14,22 @@
%bcond_with html %bcond_with html
%endif %endif
%global collection_namespace sap-linuxlab %global collection_name sap_install
%if 0%{?rhel} %if 0%{?rhel}
%define package_name rhel-system-roles-sap %define package_name rhel-system-roles-sap
%global collection_name rhel %global collection_namespace redhat
%else %else
%define package_name linux-system-roles-sap %define package_name linux-system-roles-sap
%global collection_name community %global collection_namespace community
%endif %endif
# collection_version has to be increased by every rebuild # collection_version has to be increased by every rebuild
# otherwise, it cannot be uploaded to Automation Hub and Galaxy # otherwise, it cannot be uploaded to Automation Hub and Galaxy
# due to version conflict # due to version conflict
%define collection_version 3.2.0 %define collection_version 1.0.1
%global mainid d64d1be7904aa8f279b117da6f2a31b3d4b6e43e %global mainid d64d1be7904aa8f279b117da6f2a31b3d4b6e43e
%global commit_id_sap_install 7956ecd9bd289c608f6e5c0d51c5139ae9a6d349 %global commit_id_sap_install d8330042de222480c78e040846db8bffe4321cf4
%global rolename1 sap_general_preconfigure %global rolename1 sap_general_preconfigure
%global rolename2 sap_hana_preconfigure %global rolename2 sap_hana_preconfigure
%global rolename3 sap_netweaver_preconfigure %global rolename3 sap_netweaver_preconfigure
@ -41,11 +40,11 @@
Name: %{package_name} Name: %{package_name}
Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
Version: 3.2.0 Version: 3.2.0
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Url: https://github.com/sap-linuxlab/community.sap_install Url: https://github.com/berndfinger/community.sap_install
Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
Source1: https://github.com/sap-linuxlab/%{github_repo_sap_install}archive/%{github_repo_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.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: README.md
Source5: galaxy.yml Source5: galaxy.yml
# patches 0-49 for sap-preconfigure # patches 0-49 for sap-preconfigure
@ -89,23 +88,19 @@ Provides: ansible-collection(%{collection_namespace}.%{collection_name}) = %{ver
# be compatible with the usual Fedora Provides: # be compatible with the usual Fedora Provides:
Provides: ansible-collection-%{collection_namespace}-%{collection_name} = %{version}-%{release} Provides: ansible-collection-%{collection_namespace}-%{collection_name} = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} >= 8
%{!?ansible_collection_files:%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/} %{!?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 %else
%define ansible_collection_build() ansible-galaxy collection build %if %{?ansible_collection_files:0}%{!?ansible_collection_files:1}
%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/
%endif %endif
%endif %endif
%if %{undefined ansible_collection_install}
%if %{without ansible} %if %{without ansible}
# Simply copy everything instead of galaxy-installing the built artifact. %define ansible_collection_build_install() tar -cf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz .; mkdir -p %{buildroot}%{ansible_collection_files}%{collection_name}; (cd %{buildroot}%{ansible_collection_files}%{collection_name}; tar -xf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz)
%define ansible_collection_install() mkdir -p %{buildroot}%{ansible_collection_files}; cp -a . %{buildroot}%{ansible_collection_files}/%{collection_name}/
%else %else
%define ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz %define ansible_collection_build_install() ansible-galaxy collection build; ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz
%endif
%endif %endif
%description %description
@ -126,9 +121,9 @@ Collection artifact for %{name}. This package contains %{collection_namespace}-%
# cp own galaxy.yml and rename the collection name correctly for Automation Hub and Galaxy # cp own galaxy.yml and rename the collection name correctly for Automation Hub and Galaxy
mkdir .collections mkdir .collections
cp %{SOURCE5} galaxy.yml cp %{SOURCE5} galaxy.yml
sed -i -e "s|name: rhel|name: %{collection_name}|" galaxy.yml sed -i -e "s|namespace: redhat|namespace: %{collection_namespace}|" galaxy.yml
# add correct version for Automation Hub and Galaxy # add correct version for Automation Hub and Galaxy
sed -i -e "s|version: 3.1.1|version: %{collection_version}|" galaxy.yml 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 pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_hana_preconfigure
%patch50 -p1 %patch50 -p1
@ -188,10 +183,6 @@ rm -rf .collections/ansible_collections/%{collection_namespace}/%{collection_nam
cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name} cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name}
# build collection file
cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
%ansible_collection_build
%install %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_hana_preconfigure \
@ -208,7 +199,7 @@ popd
# install collection files # install collection files
pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
%ansible_collection_install %ansible_collection_build_install
popd popd
# install collection_artifact # install collection_artifact
@ -238,6 +229,9 @@ popd
%endif %endif
%changelog %changelog
* Tue Feb 22 2022 Than Ngo <than@redhat.com> - 3.2.0-2
- Related: #2047282, new rebase, fixed collection basename
* Mon Jan 31 2022 Than Ngo <than@redhat.com> - 3.2.0-1 * Mon Jan 31 2022 Than Ngo <than@redhat.com> - 3.2.0-1
- Resolves: #2047282, Rebase to new upstream org sap-linuxlab - Resolves: #2047282, Rebase to new upstream org sap-linuxlab

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (community.sap_install-7956ecd9bd289c608f6e5c0d51c5139ae9a6d349.tar.gz) = a9ab850eedb16660a205317bd3f13977dae039d51af83c2fa640ff401ebbf50f579c157c85ec8ca0394b74b3dc41305e75ca0a2993d70875444e0d90b3f7285a
SHA512 (auto-maintenance-d64d1be7904aa8f279b117da6f2a31b3d4b6e43e.tar.gz) = 5e08a9521c80ef60848ac0b4b10209a47cae93cba7f7870174515dd34919af2d538b66352005194273c5f38664845ece01697c45bf7a6b6ec49e8d862e53c97a SHA512 (auto-maintenance-d64d1be7904aa8f279b117da6f2a31b3d4b6e43e.tar.gz) = 5e08a9521c80ef60848ac0b4b10209a47cae93cba7f7870174515dd34919af2d538b66352005194273c5f38664845ece01697c45bf7a6b6ec49e8d862e53c97a
SHA512 (community.sap_install-d8330042de222480c78e040846db8bffe4321cf4.tar.gz) = 934db37ec82d5525ff8c918ee846c64c10c265cbcbaed6ff1a822ee8cb9fc9e464396473c0690b906615c0d57ea6bc140f7eb61a882ad25231aa2067980b2ec4