From 9b2c6058aaf7e4050cf00f35c50ccd8ec43ddf4a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 12 Jul 2022 18:02:14 +0200 Subject: [PATCH] Resolves: #2101373, make the role Ansible 2.13 compliant and get rid of all the new ansible-lint 6.3.0 errors for preconfigure and sap_hana_install roles --- .gitignore | 1 + ...a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch | 64 -------- community.sap_install-shebang.patch | 90 +++++++++++ rhel-system-roles-sap.spec | 144 ++++++++---------- sap-hana-preconfigure-md2html-error.patch | 6 +- ...38a8163abf00feb8f5747fdafe9a2e4d2d97.patch | 14 -- ...9bd31df258d57308f7fcffadd433d97cc9d7.patch | 43 ------ ...871a2ccdf164033482f342dab3d36f51170f.patch | 18 --- sap_hana_preconfigure-fix-issue-#153.patch | 12 -- sources | 2 +- 10 files changed, 161 insertions(+), 233 deletions(-) delete mode 100644 community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch create mode 100644 community.sap_install-shebang.patch delete mode 100644 sap_general_preconfigure-d93938a8163abf00feb8f5747fdafe9a2e4d2d97.patch delete mode 100644 sap_hana_preconfigure-1bed9bd31df258d57308f7fcffadd433d97cc9d7.patch delete mode 100644 sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch delete mode 100644 sap_hana_preconfigure-fix-issue-#153.patch diff --git a/.gitignore b/.gitignore index cc7d6f7..bcd771f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /community.sap_install-d8330042de222480c78e040846db8bffe4321cf4.tar.gz /auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz /community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32.tar.gz +/community.sap_install-29b37456211c8bf825547f614652f24cf324860a.tar.gz diff --git a/community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch b/community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch deleted file mode 100644 index a9a4890..0000000 --- a/community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml.me community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml ---- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml.me 2022-05-23 20:03:38.155660382 +0200 -+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml 2022-05-23 20:06:38.667894467 +0200 -@@ -18,14 +18,26 @@ - __sap_general_preconfigure_req_ha_repos: '' - when: not sap_general_preconfigure_use_ha_repos - -- - name: Assert - Set final list of repos, auto -+ - name: Assert - Set final list of repos, non-s390x, auto - set_fact: - __sap_general_preconfigure_req_repos: - "{{ __sap_general_preconfigure_req_os_repos | list }} + - {{ __sap_general_preconfigure_req_netweaver_repos | list }} + - {{ __sap_general_preconfigure_req_hana_repos | list }} + - {{ __sap_general_preconfigure_req_ha_repos | list }}" -- when: sap_general_preconfigure_req_repos is undefined -+ when: -+ - sap_general_preconfigure_req_repos is undefined -+ - ansible_architecture != 's390x' -+ -+ - name: Assert - Set final list of repos, s390x, auto -+ set_fact: -+ __sap_general_preconfigure_req_repos: -+ "{{ __sap_general_preconfigure_req_os_repos | list }} + -+ {{ __sap_general_preconfigure_req_netweaver_repos | list }} + -+ {{ __sap_general_preconfigure_req_ha_repos | list }}" -+ when: -+ - sap_general_preconfigure_req_repos is undefined -+ - ansible_architecture == 's390x' - - - name: Assert - Set final list of repos, manual - set_fact: -diff -up community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml.me community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml ---- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml.me 2022-05-23 20:07:10.469897468 +0200 -+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml 2022-05-23 20:08:27.072770838 +0200 -@@ -18,14 +18,26 @@ - __sap_general_preconfigure_req_ha_repos: '' - when: not sap_general_preconfigure_use_ha_repos - -- - name: Set final list of repos, auto -+ - name: Set final list of repos, non-s390x, auto - set_fact: - __sap_general_preconfigure_req_repos: - "{{ __sap_general_preconfigure_req_os_repos | list }} + - {{ __sap_general_preconfigure_req_netweaver_repos | list }} + - {{ __sap_general_preconfigure_req_hana_repos | list }} + - {{ __sap_general_preconfigure_req_ha_repos | list }}" -- when: sap_general_preconfigure_req_repos is undefined -+ when: -+ - sap_general_preconfigure_req_repos is undefined -+ - ansible_architecture != 's390x' -+ -+ - name: Set final list of repos, s390x, auto -+ set_fact: -+ __sap_general_preconfigure_req_repos: -+ "{{ __sap_general_preconfigure_req_os_repos | list }} + -+ {{ __sap_general_preconfigure_req_netweaver_repos | list }} + -+ {{ __sap_general_preconfigure_req_ha_repos | list }}" -+ when: -+ - sap_general_preconfigure_req_repos is undefined -+ - ansible_architecture == 's390x' - - - name: Set final list of repos, manual - set_fact: diff --git a/community.sap_install-shebang.patch b/community.sap_install-shebang.patch new file mode 100644 index 0000000..d773050 --- /dev/null +++ b/community.sap_install-shebang.patch @@ -0,0 +1,90 @@ +diff -up community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py.me community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py +--- community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py.me 2022-07-12 16:23:48.262581739 +0200 ++++ community.sap_install/roles/sap_general_preconfigure/tests/run-sap_general_preconfigure-tests.py 2022-07-12 16:36:43.620709628 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + """ + Tests for role sap_general_preconfigure +diff -up community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py.me community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py +--- community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py.me 2022-07-12 16:36:52.262900877 +0200 ++++ community.sap_install/roles/sap_hana_install/tests/install/run-sap_hana_install-install-tests.py 2022-07-12 16:36:59.246055414 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import os + import sys +diff -up community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py.me community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py +--- community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py.me 2022-07-12 16:37:17.272454327 +0200 ++++ community.sap_install/roles/sap_hana_install/tests/sapcar/run-sap_hana_install-sapcar-tests.py 2022-07-12 16:37:24.142606360 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import os + import sys +diff -up community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py.me community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py +--- community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py.me 2022-07-12 16:37:52.794240408 +0200 ++++ community.sap_install/roles/sap_hana_preconfigure/tests/run-sap_hana_preconfigure-tests.py 2022-07-12 16:37:58.553367854 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + """ + Tests for role sap_hana_preconfigure +diff -up community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py.me community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py +--- community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py.me 2022-07-12 16:37:34.384833016 +0200 ++++ community.sap_install/roles/sap_netweaver_preconfigure/tests/run-sap_netweaver_preconfigure-tests.py 2022-07-12 16:37:41.495990384 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + """ + Tests for role sap_netweaver_preconfigure +diff -up community.sap_install/tools/swpm2_parameters_inifile_generate.py.me community.sap_install/tools/swpm2_parameters_inifile_generate.py +--- community.sap_install/tools/swpm2_parameters_inifile_generate.py.me 2022-07-12 16:38:10.026621753 +0200 ++++ community.sap_install/tools/swpm2_parameters_inifile_generate.py 2022-07-12 16:38:29.915061875 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type + +diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh +--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh.me 2022-07-12 17:48:10.476508351 +0200 ++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh 2022-07-12 17:48:27.813896005 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/bash + + # default font color: Light Cyan, which should be readable on both bright and dark background + __FONT_COLOR=36m +diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh +--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh.me 2022-07-12 17:48:35.527068474 +0200 ++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_install/files/tmp/tail-f-hdblcm-install-trc.sh 2022-07-12 17:48:43.703251292 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/bash + + while true; do + # in case hdblcm has not yet started, we assume that it is waiting for sapdsigner to complete: +diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh +--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh.me 2022-07-12 17:49:22.425117059 +0200 ++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh 2022-07-12 17:49:30.241291825 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/bash + + # default font color: Light Cyan, which should be readable on both bright and dark background + __FONT_COLOR=36m +diff -up community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh.me community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh +--- community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh.me 2022-07-12 17:48:51.584427510 +0200 ++++ community.sap_install-29b37456211c8bf825547f614652f24cf324860a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh 2022-07-12 17:49:00.678630847 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/bash + + # default font color: Light Cyan, which should be readable on both bright and dark background + __FONT_COLOR=36m diff --git a/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec index c63cdc1..ea93cd8 100644 --- a/rhel-system-roles-sap.spec +++ b/rhel-system-roles-sap.spec @@ -26,45 +26,45 @@ # collection_version has to be increased by every rebuild # otherwise, it cannot be uploaded to Automation Hub and Galaxy # due to version conflict -%define collection_version 1.0.3 +%define collection_version 1.1.0 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0 -%global commit_id_sap_install 57211739079e4ef37f51c45c30ea071c0956ad32 +%global commit_id_sap_install 29b37456211c8bf825547f614652f24cf324860a %global rolename1 sap_general_preconfigure %global rolename2 sap_hana_preconfigure %global rolename3 sap_netweaver_preconfigure -%global rolename4 sap_ha_install_hana_hsr -%global rolename5 sap_ha_install_pacemaker -%global rolename6 sap_hana_install -%global rolename7 sap_ha_set_hana -%global rolename8 sap_ha_set_netweaver -%global rolename9 sap_hostagent -%global rolename10 sap_install_media_detect -%global rolename11 sap_storage -%global rolename12 sap_swpm +%global rolename4 sap_hana_install +%global rolename5 sap_ha_set_hana +%global rolename6 sap_ha_set_netweaver +%global rolename7 sap_hostagent +%global rolename8 sap_install_media_detect +%global rolename9 sap_storage +%global rolename10 sap_swpm +%global rolename11 sap_ha_install_hana_hsr +%global rolename12 sap_ha_prepare_pacemaker +%global rolename13 sap_ha_install_pacemaker %global src_owner linux-system-roles %global github_repo_sap_install community.sap_install +%global rolename_rhel %{rolename1} %{rolename2} %{rolename3} %{rolename4} %{rolename5} %{rolename11} %{rolename12} %{rolename13} +%global rolename_community %{rolename_rhel} %{rolename1} %{rolename6} %{rolename7} %{rolename8} %{rolename9} %{rolename10} +%if 0%{?fedora} +%global rolenames %{rolename_community} +%else +%global rolenames %{rolename_rhel} +%endif Name: %{package_name} Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products -Version: 3.2.0 -Release: 5%{?dist} +Version: 3.3.0 +Release: 2%{?dist} License: GPLv3+ Url: https://github.com/berndfinger/community.sap_install Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source1: https://github.com/berndfinger/%{github_repo_sap_install}/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz Source4: README.md Source5: galaxy.yml -# patches 0-49 for sap-preconfigure -# patches 50-99 for sap-hana-preconfigure -Patch50: sap-hana-preconfigure-md2html-error.patch -Patch51: sap_hana_preconfigure-fix-issue-#153.patch -Patch52: sap_hana_preconfigure-1bed9bd31df258d57308f7fcffadd433d97cc9d7.patch -Patch53: sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch -# patches 100-149 for sap-netweaver-preconfigur -# patches 150-199 for sap_general_preconfigure -Patch150: community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch -Patch151: sap_general_preconfigure-d93938a8163abf00feb8f5747fdafe9a2e4d2d97.patch +Patch1: community.sap_install-shebang.patch +Patch2: sap-hana-preconfigure-md2html-error.patch BuildArch: noarch @@ -139,15 +139,9 @@ sed -i -e "s|namespace: redhat|namespace: %{collection_namespace}|" galaxy.yml # add correct version for Automation Hub and Galaxy sed -i -e "s|version: 1.0.0|version: %{collection_version}|" galaxy.yml -pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_hana_preconfigure -%patch50 -p1 -%patch51 -p1 -%patch52 -p3 -%patch53 -p1 -popd pushd %{github_repo_sap_install}-%{commit_id_sap_install}/ -%patch150 -p1 -%patch151 -p1 +%patch1 -p1 +%patch2 -p1 popd pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/ @@ -170,56 +164,44 @@ rm -f sap_hana_preconfigure/vars/SLES_15.yml popd %build -%if 0%{?fedora} -for role in %{rolename1} %{rolename2} %{rolename3} %{rolename4} \ - %{rolename5} %{rolename6} %{rolename7} %{rolename8} \ - %{rolename9} %{rolename10} %{rolename11} %{rolename12} ; do -%else -sh md2html.sh \ -%{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_general_preconfigure/README.md \ -%{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_hana_preconfigure/README.md \ -%{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_netweaver_preconfigure/README.md -for role in %{rolename1} %{rolename2} %{rolename3} %{rolename4} ; do -%endif - LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 lsr_role2collection.py --role "$role" \ - --src-path %{github_repo_sap_install}-%{commit_id_sap_install}/roles/"$role" \ - --src-owner %{src_owner} \ - --dest-path .collections \ - --readme %{SOURCE4} \ - --namespace %{collection_namespace} \ - --collection %{collection_name} \ - --new-role "$new_role" -done - -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 +%if %{with html} +readmes="" 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 + readmes="${readmes} %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md" done +sh md2html.sh $readmes +%endif -# removing dot files/dirs -rm -rf .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.[A-Za-z]* +for role in %{rolenames} ; do +LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 lsr_role2collection.py --role "$role" \ + --src-path %{github_repo_sap_install}-%{commit_id_sap_install}/roles/"$role" \ + --src-owner %{src_owner} \ + --dest-path .collections \ + --readme %{SOURCE4} \ + --namespace %{collection_namespace} \ + --collection %{collection_name} \ + --new-role "$new_role" +done cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name} %install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles \ - $RPM_BUILD_ROOT%{_pkgdocdir}/sap_hana_preconfigure \ - $RPM_BUILD_ROOT%{_pkgdocdir}/sap_general_preconfigure \ - $RPM_BUILD_ROOT%{_pkgdocdir}/sap_netweaver_preconfigure \ - $RPM_BUILD_ROOT%{_pkgdocdir}/sap_hana_install +mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles -pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/ -for f in sap_hana_preconfigure sap_general_preconfigure sap_netweaver_preconfigure sap_hana_install ; do - cp -pR $f $RPM_BUILD_ROOT%{_datadir}/ansible/roles/ - install -m 644 ../LICENSE $f/README.md $RPM_BUILD_ROOT%{_pkgdocdir}/$f +# create file selection for documents +echo "%dir %{_pkgdocdir}" > 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 -popd # install collection files pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ @@ -234,15 +216,13 @@ mv %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz $RPM_ popd %endif -%files -%dir %{_pkgdocdir} -%dir %{_pkgdocdir}/sap_general_preconfigure -%dir %{_pkgdocdir}/sap_hana_preconfigure -%dir %{_pkgdocdir}/sap_netweaver_preconfigure -%dir %{_pkgdocdir}/sap_hana_install +%files -f files_section.txt %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} @@ -253,6 +233,14 @@ popd %endif %changelog +* Tue Jul 12 2022 Than Ngo - 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: #2101373 + +* Mon Jul 04 2022 Than Ngo - 3.3.0-1 +- Resolves: #2101373, include roles for setting up a two-node SAP HANA pacemaker cluster + * Wed Jun 08 2022 Than Ngo - 3.2.0-5 - increase release Related: #2065407 diff --git a/sap-hana-preconfigure-md2html-error.patch b/sap-hana-preconfigure-md2html-error.patch index 99821ae..f3ace35 100644 --- a/sap-hana-preconfigure-md2html-error.patch +++ b/sap-hana-preconfigure-md2html-error.patch @@ -1,6 +1,6 @@ -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 +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 ``` diff --git a/sap_general_preconfigure-d93938a8163abf00feb8f5747fdafe9a2e4d2d97.patch b/sap_general_preconfigure-d93938a8163abf00feb8f5747fdafe9a2e4d2d97.patch deleted file mode 100644 index 7831c3d..0000000 --- a/sap_general_preconfigure-d93938a8163abf00feb8f5747fdafe9a2e4d2d97.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml.me community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml ---- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml.me 2022-06-08 19:00:38.776364517 +0200 -+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/main.yml 2022-06-08 19:03:14.966871047 +0200 -@@ -7,8 +7,8 @@ - - name: Include OS specific vars, specific - include_vars: '{{ item }}' - with_first_found: -- - '{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml' -- - '{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml' -+ - '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_version }}.yml' -+ - '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_major_version }}.yml' - - '{{ ansible_os_family }}.yml' - - - name: Rename user sap_preconfigure variables if found diff --git a/sap_hana_preconfigure-1bed9bd31df258d57308f7fcffadd433d97cc9d7.patch b/sap_hana_preconfigure-1bed9bd31df258d57308f7fcffadd433d97cc9d7.patch deleted file mode 100644 index a410232..0000000 --- a/sap_hana_preconfigure-1bed9bd31df258d57308f7fcffadd433d97cc9d7.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 1bed9bd31df258d57308f7fcffadd433d97cc9d7 -Author: Bernd Finger <> -Date: Wed Jun 8 17:51:30 2022 +0200 - - sap_hana_preconfigure: Add vars for RHEL 9.1 managed nodes - - The minimum RHEL 9 kernel for RHEL 9.0 is now set to be identical to the - GA kernel. - -diff --git a/roles/sap_hana_preconfigure/vars/RedHat_9.yml b/roles/sap_hana_preconfigure/vars/RedHat_9.yml -index 0be479b..d3440e5 100644 ---- a/roles/sap_hana_preconfigure/vars/RedHat_9.yml -+++ b/roles/sap_hana_preconfigure/vars/RedHat_9.yml -@@ -15,6 +15,16 @@ __sap_hana_preconfigure_req_repos_redhat_9_0_ppc64le: - - "rhel-9-for-ppc64le-appstream-e4s-rpms" - - "rhel-9-for-ppc64le-sap-solutions-e4s-rpms" - -+__sap_hana_preconfigure_req_repos_redhat_9_1_x86_64: -+ - "rhel-9-for-x86_64-baseos-rpms" -+ - "rhel-9-for-x86_64-appstream-rpms" -+ - "rhel-9-for-x86_64-sap-solutions-rpms" -+ -+__sap_hana_preconfigure_req_repos_redhat_9_1_ppc64le: -+ - "rhel-9-for-ppc64le-baseos-rpms" -+ - "rhel-9-for-ppc64le-appstream-rpms" -+ - "rhel-9-for-ppc64le-sap-solutions-rpms" -+ - # required SAP notes for RHEL 9: - __sap_hana_preconfigure_sapnotes_versions_x86_64: - - { number: '2777782', version: '22' } -@@ -36,10 +46,10 @@ __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars','__sap_hana_preconf - - # Minimum required package levels for RHEL 9.0: - __sap_hana_preconfigure_min_packages_9_0_x86_64: -- - [ 'kernel', '5.11.0-1.el9' ] -+ - [ 'kernel', '5.14.0-70.13.1.el9_0' ] - - __sap_hana_preconfigure_min_packages_9_0_ppc64le: -- - [ 'kernel', '5.11.0-2.el9' ] -+ - [ 'kernel', '5.14.0-70.13.1.el9_0' ] - - __sap_hana_preconfigure_min_packages_9_1_x86_64: - diff --git a/sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch b/sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch deleted file mode 100644 index 74528d4..0000000 --- a/sap_hana_preconfigure-ac33871a2ccdf164033482f342dab3d36f51170f.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up sap_hana_preconfigure/handlers/main.yml.me sap_hana_preconfigure/handlers/main.yml ---- sap_hana_preconfigure/handlers/main.yml.me 2022-06-08 18:52:49.832790508 +0200 -+++ sap_hana_preconfigure/handlers/main.yml 2022-06-08 18:53:28.792668038 +0200 -@@ -37,12 +37,14 @@ - - name: "Set the grub.cfg location RHEL" - set_fact: - __sap_hana_preconfigure_uefi_boot_dir: /boot/efi/EFI/redhat/grub.cfg -+ listen: __sap_hana_preconfigure_regenerate_grub2_conf_handler - when: - - ansible_distribution == 'RedHat' - - - name: "Set the grub.cfg location SLES" - set_fact: - __sap_hana_preconfigure_uefi_boot_dir: /boot/efi/EFI/BOOT/grub.cfg -+ listen: __sap_hana_preconfigure_regenerate_grub2_conf_handler - when: - - ansible_distribution == 'SLES' or ansible_distribution == 'SLES_SAP' - diff --git a/sap_hana_preconfigure-fix-issue-#153.patch b/sap_hana_preconfigure-fix-issue-#153.patch deleted file mode 100644 index 22551da..0000000 --- a/sap_hana_preconfigure-fix-issue-#153.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml.me sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml ---- sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml.me 2022-06-08 12:49:58.107218399 +0200 -+++ sap_hana_preconfigure/tasks/RedHat/generic/assert-cpu-governor-for-performance.yml 2022-06-08 12:51:53.264830397 +0200 -@@ -25,7 +25,7 @@ - - - name: Assert that file /etc/rc.d/rc.local exists (x86_64 platform only) - assert: -- that: __stat_boot_local.stat.exists -+ that: __sap_hana_preconfigure_register_stat_rc_local_assert.stat.exists - fail_msg: "FAIL: File /etc/rc.d/rc.local does not exist!" - success_msg: "PASS: File /etc/rc.d/rc.local exist." - ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors|d(false) }}" diff --git a/sources b/sources index d5c473c..b60ae2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz) = 3d5c784e668605eb8b7862227b456da05ff5dedf84411131a27118b501b6a9bbe8894c4f29e6de4230fe534ef6b2de4653c56a904857d9eb11b452d31aed143c -SHA512 (community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32.tar.gz) = 8d647d6daba92b0d1d40dd63fd56449c7d063461bf2fc2c8a6bb4cf8f204b3b218de86ffa2a986a38eac2e6195db8c41a0c4dc61eba895f72f3a92cc76b2d527 +SHA512 (community.sap_install-29b37456211c8bf825547f614652f24cf324860a.tar.gz) = f7595e038114a42c2db4115367df11c3bfd91164bccb4cab64d991a0e7eb17a7409d2768942f1c2ddf63bec5368cdda5cd11ffee084b7c0cba49df44f31b8a4c