Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
eabdullin
|
7697b3e7f4 | |
eabdullin
|
2b6243b40e |
|
|
@ -1,3 +1,4 @@
|
|||
SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
|
||||
SOURCES/community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz
|
||||
SOURCES/prepare-redhat.sap_install-main.tar.bz2
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
584f8d1681adf13cb7af256a7b38d94ca80dcab2 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
|
||||
d991a279d5d4b5a991f229a29d20e772132af519 SOURCES/community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz
|
||||
017c84ab579375755b104b85d5eb77b26a117a80 SOURCES/prepare-redhat.sap_install-main.tar.bz2
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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-->
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
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
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
commit 2557f321ab86bba4cbf463eaf69df8d1bb3a2261
|
||||
Author: Bernd Finger <bfinger@redhat.com>
|
||||
Date: Mon Sep 6 09:26:10 2021 +0200
|
||||
|
||||
use grubby for setting tsx=on; set min kernel version for RHEL 8.4 x86_64
|
||||
|
||||
diff --git a/handlers/main.yml b/handlers/main.yml
|
||||
index 0d81021..8387bc7 100644
|
||||
--- a/handlers/main.yml
|
||||
+++ b/handlers/main.yml
|
||||
@@ -49,6 +49,12 @@
|
||||
- __sap_hana_preconfigure_register_stat_sys_firmware_efi.stat.exists
|
||||
- sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
||||
|
||||
+- name: "Run grubby"
|
||||
+ command: grubby --args="tsx=on" --update-kernel=ALL
|
||||
+ register: __sap_hana_preconfigure_register_grubby_update
|
||||
+ listen: __sap_hana_preconfigure_grubby_update_handler
|
||||
+ notify: __sap_hana_preconfigure_reboot_handler
|
||||
+
|
||||
- name: Reboot the managed node
|
||||
reboot:
|
||||
test_command: /bin/true
|
||||
diff --git a/tasks/RedHat/generic/enable-tsx.yml b/tasks/RedHat/generic/enable-tsx.yml
|
||||
index c4be81c..09b87d3 100644
|
||||
--- a/tasks/RedHat/generic/enable-tsx.yml
|
||||
+++ b/tasks/RedHat/generic/enable-tsx.yml
|
||||
@@ -4,21 +4,11 @@
|
||||
msg: "imported RedHat/generic/enable-tsx.yml"
|
||||
|
||||
- name: Enable TSX at boot time
|
||||
- lineinfile:
|
||||
- path: /etc/default/grub
|
||||
- backup: yes
|
||||
- backrefs: yes
|
||||
- state: present
|
||||
- regexp: '^(GRUB_CMDLINE_LINUX=(?!.* {{ line_item }}).*). *$'
|
||||
- line: "\\1 {{ line_item }}\""
|
||||
- with_items:
|
||||
- - "tsx=on"
|
||||
- notify: __sap_hana_preconfigure_regenerate_grub2_conf_handler
|
||||
+ command: /bin/true
|
||||
+ notify: __sap_hana_preconfigure_grubby_update_handler
|
||||
when:
|
||||
- ansible_architecture == 'x86_64'
|
||||
- ansible_distribution == 'RedHat'
|
||||
- ansible_distribution_major_version == '8'
|
||||
- __sap_hana_preconfigure_fact_ansible_distribution_minor_version >= '3'
|
||||
tags: grubconfig
|
||||
- loop_control:
|
||||
- loop_var: line_item
|
||||
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
|
||||
index 29efc7a..dd77300 100644
|
||||
--- a/vars/RedHat_8.yml
|
||||
+++ b/vars/RedHat_8.yml
|
||||
@@ -135,6 +135,7 @@ __sap_hana_preconfigure_min_packages_8_3_x86_64:
|
||||
__sap_hana_preconfigure_min_packages_8_3_ppc64le:
|
||||
|
||||
__sap_hana_preconfigure_min_packages_8_4_x86_64:
|
||||
+ - [ 'kernel' , '4.18.0-305.3.1.el8_4' ]
|
||||
|
||||
__sap_hana_preconfigure_min_packages_8_4_ppc64le:
|
||||
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
commit 61b366bb366f1dca0684d00f7cbf4563f71630e6
|
||||
Author: Bernd Finger <bfinger@redhat.com>
|
||||
Date: Fri Sep 3 12:16:35 2021 +0200
|
||||
|
||||
add tsx=on to the kernel command line unconditionally
|
||||
|
||||
diff --git a/tasks/RedHat/generic/enable-tsx.yml b/tasks/RedHat/generic/enable-tsx.yml
|
||||
index 3dd6d09..c4be81c 100644
|
||||
--- a/tasks/RedHat/generic/enable-tsx.yml
|
||||
+++ b/tasks/RedHat/generic/enable-tsx.yml
|
||||
@@ -3,16 +3,7 @@
|
||||
- debug:
|
||||
msg: "imported RedHat/generic/enable-tsx.yml"
|
||||
|
||||
-- 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
|
||||
+- name: Enable TSX at boot time
|
||||
lineinfile:
|
||||
path: /etc/default/grub
|
||||
backup: yes
|
||||
@@ -28,7 +19,6 @@
|
||||
- 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
|
||||
|
|
@ -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 }}"
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
commit 62908fd7a79a4ef0d38ce2e48bca5970eb0f2304
|
||||
Author: Bernd Finger <bfinger@redhat.com>
|
||||
Date: Tue Aug 31 16:38:13 2021 +0200
|
||||
|
||||
fix yum group install errors on RHEL 7
|
||||
|
||||
diff --git a/tasks/installation.yml b/tasks/installation.yml
|
||||
index ac63e9f..3ff6ef4 100644
|
||||
--- a/tasks/installation.yml
|
||||
+++ b/tasks/installation.yml
|
||||
@@ -1,7 +1,7 @@
|
||||
---
|
||||
|
||||
- name: Ensure required package groups are installed, RHEL 7
|
||||
- command: yum install "{{ sap_preconfigure_packagegroups|join('')|quote }}" -y
|
||||
+ command: "yum install {{ sap_preconfigure_packagegroups|join(' ') }} -y"
|
||||
args:
|
||||
warn: false
|
||||
register: __sap_preconfigure_register_yum_group_install
|
||||
@@ -9,9 +9,9 @@
|
||||
- ansible_os_family == 'RedHat'
|
||||
- ansible_distribution_major_version == '7'
|
||||
|
||||
-- name: Ensure required package groups are installed, RHEL 8 and later
|
||||
+- name: Ensure required package groups are installed, RHEL 8 and RHEL 9
|
||||
# Note: We want to avoid unwanted package upgrades, see bug 1983749.
|
||||
- command: yum install "{{ sap_preconfigure_packagegroups|join('')|quote }}" --nobest --exclude="kernel*" -y
|
||||
+ command: "yum install {{ sap_preconfigure_packagegroups|join(' ') }} --nobest --exclude=kernel* -y"
|
||||
args:
|
||||
warn: false
|
||||
register: __sap_preconfigure_register_yum_group_install
|
||||
|
|
@ -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 }}" --nobest --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:
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
commit fa66c6722c0bf31c651c1d63972d9a32b9218ccf
|
||||
Author: Bernd Finger <bfinger@redhat.com>
|
||||
Date: Mon Aug 30 22:10:49 2021 +0200
|
||||
|
||||
do not use yum option "--nobest" on RHEL 7
|
||||
|
||||
diff --git a/tasks/installation.yml b/tasks/installation.yml
|
||||
index 096c993..ac63e9f 100644
|
||||
--- a/tasks/installation.yml
|
||||
+++ b/tasks/installation.yml
|
||||
@@ -1,12 +1,25 @@
|
||||
---
|
||||
|
||||
-- name: Ensure required package groups are installed
|
||||
-# 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.
|
||||
+- name: Ensure required package groups are installed, RHEL 7
|
||||
+ command: yum install "{{ sap_preconfigure_packagegroups|join('')|quote }}" -y
|
||||
+ args:
|
||||
+ warn: false
|
||||
+ register: __sap_preconfigure_register_yum_group_install
|
||||
+ when:
|
||||
+ - ansible_os_family == 'RedHat'
|
||||
+ - ansible_distribution_major_version == '7'
|
||||
+
|
||||
+- name: Ensure required package groups are installed, RHEL 8 and later
|
||||
+# Note: We want to avoid unwanted package upgrades, see bug 1983749.
|
||||
command: yum install "{{ sap_preconfigure_packagegroups|join('')|quote }}" --nobest --exclude="kernel*" -y
|
||||
args:
|
||||
warn: false
|
||||
register: __sap_preconfigure_register_yum_group_install
|
||||
+ when:
|
||||
+ - ansible_os_family == 'RedHat'
|
||||
+ - (ansible_distribution_major_version == '8' or
|
||||
+ ansible_distribution_major_version == '9'
|
||||
+ )
|
||||
|
||||
- debug:
|
||||
var: __sap_preconfigure_register_yum_group_install
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
%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,
|
||||
|
|
@ -14,54 +14,47 @@
|
|||
%bcond_with html
|
||||
%endif
|
||||
|
||||
%global collection_name sap_install
|
||||
%global collection_namespace sap
|
||||
%if 0%{?rhel}
|
||||
%define package_name rhel-system-roles-sap
|
||||
%global collection_namespace redhat
|
||||
%global collection_name rhel
|
||||
%else
|
||||
%define package_name linux-system-roles-sap
|
||||
%global collection_namespace community
|
||||
%global collection_name linux
|
||||
%endif
|
||||
|
||||
# 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.2.1
|
||||
|
||||
%global mainid e2a233f5a0cb68363798bf014b16552cca681bd0
|
||||
%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_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 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
|
||||
%global github_repo_sap_install community.sap_install
|
||||
%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
|
||||
%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.4.0
|
||||
Release: 3%{?dist}
|
||||
Version: 3.1.1
|
||||
Release: 6%{?dist}.alma
|
||||
License: GPLv3+
|
||||
Url: https://github.com/berndfinger/community.sap_install
|
||||
Url: https://github.com/berndfinger
|
||||
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
|
||||
# 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
|
||||
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
|
||||
Patch2: sap-preconfigure-fa66c6722c0bf31c651c1d63972d9a32b9218ccf.patch
|
||||
Patch3: sap-preconfigure-62908fd7a79a4ef0d38ce2e48bca5970eb0f2304.patch
|
||||
# patches 50-99 for sap-hana-preconfigure
|
||||
Patch50: sap-hana-preconfigure-md2html-error.patch
|
||||
Patch51: sap-hana-preconfigure-f30be1952fe55cc4a5e153bfd13863f527643d40.patch
|
||||
Patch52: sap-hana-preconfigure-61b366bb366f1dca0684d00f7cbf4563f71630e6.patch
|
||||
Patch53: sap-hana-preconfigure-2557f321ab86bba4cbf463eaf69df8d1bb3a2261.patch
|
||||
# patches 100-149 for sap-netweaver-preconfigur
|
||||
Patch100: sap-netweaver-preconfigure-rhel9.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -90,28 +83,34 @@ Requires: python-netaddr
|
|||
%endif
|
||||
|
||||
%if %{with ansible}
|
||||
BuildRequires: ansible-core >= 2.9.10
|
||||
BuildRequires: ansible >= 2.9.10
|
||||
%endif
|
||||
|
||||
%global collection_version %{version}
|
||||
|
||||
%if %{undefined __ansible_provides}
|
||||
Provides: ansible-collection(%{collection_namespace}.%{collection_name}) = %{version}
|
||||
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}
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%{!?ansible_collection_files:%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/}
|
||||
%else
|
||||
%if %{?ansible_collection_files:0}%{!?ansible_collection_files:1}
|
||||
%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%if %{undefined ansible_collection_build}
|
||||
%if %{without ansible}
|
||||
%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)
|
||||
# Empty command. We don't have ansible-galaxy.
|
||||
%define ansible_collection_build() :
|
||||
%else
|
||||
%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
|
||||
%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
|
||||
|
|
@ -123,186 +122,142 @@ to applicable SAP notes so that any SAP software can be installed.
|
|||
Summary: Collection artifact to import to Automation Hub / Ansible Galaxy
|
||||
|
||||
%description collection-artifact
|
||||
Collection artifact for %{name}. This package contains %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz
|
||||
Collection artifact for %{name}. This package contains %{collection_namespace}-%{collection_name}-%{version}.tar.gz
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -a1 -a2 -n auto-maintenance-%{mainid}
|
||||
%setup -q -a1 -a2 -a3 -n auto-maintenance-%{mainid}
|
||||
|
||||
# add correct version and namespace for Automation Hub and Galaxy
|
||||
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
|
||||
# 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
|
||||
|
||||
# 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
|
||||
# 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 %{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
|
||||
|
||||
pushd sap-preconfigure
|
||||
%patch1 -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
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
popd
|
||||
pushd sap-hana-preconfigure
|
||||
%patch50 -p1
|
||||
%patch51 -p1
|
||||
%patch52 -p1
|
||||
%patch53 -p1
|
||||
popd
|
||||
pushd sap-netweaver-preconfigure
|
||||
%patch100 -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 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 */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
|
||||
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
|
||||
popd
|
||||
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
|
||||
%if %{with html}
|
||||
readmes=""
|
||||
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
|
||||
readmes="${readmes} %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md"
|
||||
done
|
||||
sh md2html.sh $readmes %{github_repo_sap_install}-%{commit_id_sap_install}/README.md
|
||||
%endif
|
||||
|
||||
# create dest-path
|
||||
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 \
|
||||
--namespace %{collection_namespace} \
|
||||
--collection %{collection_name} \
|
||||
--new-role "$new_role"
|
||||
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
|
||||
|
||||
cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name}
|
||||
# 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 \
|
||||
$RPM_BUILD_ROOT%{_pkgdocdir}
|
||||
$RPM_BUILD_ROOT%{_pkgdocdir}/sap-hana-preconfigure \
|
||||
$RPM_BUILD_ROOT%{_pkgdocdir}/sap-preconfigure \
|
||||
$RPM_BUILD_ROOT%{_pkgdocdir}/sap-netweaver-preconfigure
|
||||
|
||||
# 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/
|
||||
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
|
||||
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_build_install
|
||||
%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}/
|
||||
mv %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz $RPM_BUILD_ROOT%{_datadir}/ansible/collections/
|
||||
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 -f files_section.txt
|
||||
%files
|
||||
%dir %{_pkgdocdir}
|
||||
%dir %{_pkgdocdir}/sap-preconfigure
|
||||
%dir %{_pkgdocdir}/sap-hana-preconfigure
|
||||
%dir %{_pkgdocdir}/sap-netweaver-preconfigure
|
||||
%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}
|
||||
|
||||
%if %{with collection_artifact}
|
||||
%files collection-artifact
|
||||
%{_datadir}/ansible/collections/%{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz
|
||||
%{_datadir}/ansible/collections/%{collection_namespace}-%{collection_name}-%{version}.tar.gz
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 30 2023 Than Ngo <than@redhat.com> - 3.4.0-3
|
||||
- Related: #2155876, rebase sap roles to version 1.2.1
|
||||
|
||||
* Thu Jan 19 2023 Than Ngo <than@redhat.com> - 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 <than@redhat.com> - 3.4.0-1
|
||||
- Resolves: #2155876, rebase sap roles to version 1.2.0
|
||||
|
||||
* Tue Nov 22 2022 Than Ngo <than@redhat.com> - 3.3.0-4
|
||||
- Resolves: #2142957, drop deprecated paramater for Ansible 2.14
|
||||
|
||||
* 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: #2063050
|
||||
|
||||
* Mon Mar 21 2022 Than Ngo <than@redhat.com> - 3.2.0-1
|
||||
- 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
|
||||
|
||||
* Fri Dec 03 2021 Than Ngo <than@redhat.com> - 3.1.1-8
|
||||
- Related: #2016858, rebase
|
||||
|
||||
* Tue Nov 16 2021 Than Ngo <than@redhat.com> - 3.1.1-7
|
||||
- Resolves: #2016858, ansible-lint cleanup
|
||||
|
||||
* Wed Sep 08 2021 Than Ngo <than@redhat.com> - 3.1.1-6
|
||||
- set min kernel version for RHEL 8.4 x86_64
|
||||
- use grubby for setting tsx=on
|
||||
|
|
|
|||
Loading…
Reference in New Issue