diff --git a/.gitignore b/.gitignore index 1babc21..af3cfea 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32.tar.gz /community.sap_install-29b37456211c8bf825547f614652f24cf324860a.tar.gz /community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f.tar.gz +/community.sap_install-d6756cbaed7657d6ca3508a97dcc3617e995999f.tar.gz diff --git a/community.sap_install-ansible-lint-errors.patch b/community.sap_install-ansible-lint-errors.patch deleted file mode 100644 index 2ee3cf4..0000000 --- a/community.sap_install-ansible-lint-errors.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 3c225d526663084ca7ca6060fae6cb64d2834307 -Author: Bernd Finger -Date: Thu Nov 17 14:01:26 2022 +0100 - - preconfigure roles: Solve ansible-lint errors for issue #246 - -diff --git a/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml b/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml -index 64eb3f7..3d2f6d8 100644 ---- a/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml -+++ b/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml -@@ -167,7 +167,8 @@ - msg: "INFO: No minimum required package version defined (variable __sap_hana_preconfigure_min_pkgs)." - when: not __sap_hana_preconfigure_min_pkgs | d([]) - --- name: Get info about possible package updates -+# Reason for noqa: The yum module appears to not support the check-update option -+- name: Get info about possible package updates # noqa command-instead-of-module - ansible.builtin.command: yum check-update - register: __sap_hana_preconfigure_register_yum_check_update_assert - changed_when: false -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml.me 2022-11-22 16:03:52.385722586 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml 2022-11-22 16:06:49.465856762 +0100 -@@ -7,7 +7,8 @@ - - - name: Check of package pseries-energy - block: -- - name: Check if package pseries-energy is not installed -+ # Reason for noqa: In assert mode, we do not enforce a certain configuration. -+ - name: Check if package pseries-energy is not installed # noqa command-instead-of-module - ansible.builtin.command: yum info installed pseries-energy - register: __sap_hana_preconfigure_register_yum_pseries_energy_assert - changed_when: no diff --git a/community.sap_install-prepare-rhel-9x.patch b/community.sap_install-prepare-rhel-9x.patch deleted file mode 100644 index dbdfa74..0000000 --- a/community.sap_install-prepare-rhel-9x.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/vars/RedHat_9.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/vars/RedHat_9.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/vars/RedHat_9.yml.me 2022-11-28 12:02:22.311081546 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/vars/RedHat_9.yml 2022-11-28 13:41:02.874075668 +0100 -@@ -25,6 +25,76 @@ __sap_hana_preconfigure_req_repos_redhat - - "rhel-9-for-ppc64le-appstream-rpms" - - "rhel-9-for-ppc64le-sap-solutions-rpms" - -+__sap_hana_preconfigure_req_repos_redhat_9_2_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_2_ppc64le: -+ - "rhel-9-for-ppc64le-baseos-rpms" -+ - "rhel-9-for-ppc64le-appstream-rpms" -+ - "rhel-9-for-ppc64le-sap-solutions-rpms" -+ -+__sap_hana_preconfigure_req_repos_redhat_9_3_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_3_ppc64le: -+ - "rhel-9-for-ppc64le-baseos-rpms" -+ - "rhel-9-for-ppc64le-appstream-rpms" -+ - "rhel-9-for-ppc64le-sap-solutions-rpms" -+ -+__sap_hana_preconfigure_req_repos_redhat_9_4_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_4_ppc64le: -+ - "rhel-9-for-ppc64le-baseos-rpms" -+ - "rhel-9-for-ppc64le-appstream-rpms" -+ - "rhel-9-for-ppc64le-sap-solutions-rpms" -+ -+__sap_hana_preconfigure_req_repos_redhat_9_5_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_5_ppc64le: -+ - "rhel-9-for-ppc64le-baseos-rpms" -+ - "rhel-9-for-ppc64le-appstream-rpms" -+ - "rhel-9-for-ppc64le-sap-solutions-rpms" -+ -+__sap_hana_preconfigure_req_repos_redhat_9_6_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_6_ppc64le: -+ - "rhel-9-for-ppc64le-baseos-rpms" -+ - "rhel-9-for-ppc64le-appstream-rpms" -+ - "rhel-9-for-ppc64le-sap-solutions-rpms" -+ -+__sap_hana_preconfigure_req_repos_redhat_9_7_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_7_ppc64le: -+ - "rhel-9-for-ppc64le-baseos-rpms" -+ - "rhel-9-for-ppc64le-appstream-rpms" -+ - "rhel-9-for-ppc64le-sap-solutions-rpms" -+ -+__sap_hana_preconfigure_req_repos_redhat_9_8_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_8_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' } diff --git a/community.sap_install-warn-no-longer-supported.patch b/community.sap_install-warn-no-longer-supported.patch deleted file mode 100644 index 105e305..0000000 --- a/community.sap_install-warn-no-longer-supported.patch +++ /dev/null @@ -1,220 +0,0 @@ -commit d52feb6262501f0723b67fc06c38ca0019d6d31d -Author: Bernd Finger -Date: Thu Nov 17 13:27:00 2022 +0100 - - preconfigure roles: Solve issue #246 - -diff --git a/roles/sap_general_preconfigure/handlers/main.yml b/roles/sap_general_preconfigure/handlers/main.yml -index 47ad190..8d43fdf 100644 ---- a/roles/sap_general_preconfigure/handlers/main.yml -+++ b/roles/sap_general_preconfigure/handlers/main.yml -@@ -26,8 +26,6 @@ - - - name: Remount /dev/shm - ansible.builtin.command: mount -o remount /dev/shm -- args: -- warn: false - listen: __sap_general_preconfigure_mount_tmpfs_handler - - - name: Check if /dev/shm is available -diff --git a/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml b/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml -index da8233f..9f0e8cf 100644 ---- a/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml -+++ b/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml -@@ -229,9 +229,8 @@ - - name: Get info about possible package updates - ansible.builtin.command: yum check-update - register: __sap_general_preconfigure_register_yum_check_update_assert -- args: -- warn: false - changed_when: false -+ no_log: true - ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}" - when: sap_general_preconfigure_update - -@@ -278,8 +277,6 @@ - ansible.builtin.shell: "{{ __sap_general_preconfigure_fact_needs_restarting_command_assert }}" - register: __sap_general_preconfigure_register_needs_restarting_assert - changed_when: false -- args: -- warn: false - check_mode: false - ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}" - -diff --git a/roles/sap_general_preconfigure/tasks/RedHat/installation.yml b/roles/sap_general_preconfigure/tasks/RedHat/installation.yml -index 1600940..8471acf 100644 ---- a/roles/sap_general_preconfigure/tasks/RedHat/installation.yml -+++ b/roles/sap_general_preconfigure/tasks/RedHat/installation.yml -@@ -78,8 +78,6 @@ - - name: Get list of enabled repositories - ansible.builtin.command: "yum repolist" # noqa command-instead-of-module - register: __sap_general_preconfigure_register_yum_repolist -- args: -- warn: false - changed_when: false - - - name: Display the list of enabled repositories -diff --git a/roles/sap_general_preconfigure/tasks/SLES/assert-installation.yml b/roles/sap_general_preconfigure/tasks/SLES/assert-installation.yml -index 647c5df..53f4446 100644 ---- a/roles/sap_general_preconfigure/tasks/SLES/assert-installation.yml -+++ b/roles/sap_general_preconfigure/tasks/SLES/assert-installation.yml -@@ -81,8 +81,6 @@ - - name: Get info about possible package updates - ansible.builtin.command: yum check-update - register: __sap_general_preconfigure_register_yum_check_update_assert -- args: -- warn: false - changed_when: false - ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}" - when: sap_general_preconfigure_update -diff --git a/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml b/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml -index 8d72936..64eb3f7 100644 ---- a/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml -+++ b/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml -@@ -170,9 +170,8 @@ - - name: Get info about possible package updates - ansible.builtin.command: yum check-update - register: __sap_hana_preconfigure_register_yum_check_update_assert -- args: -- warn: false - changed_when: false -+ no_log: true - ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors | d(false) }}" - when: sap_hana_preconfigure_update - -diff --git a/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml b/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml -index e84302a..8b2133f 100644 ---- a/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml -+++ b/roles/sap_hana_preconfigure/tasks/sapnote/2292690/10-assert-ibm-energyscale.yml -@@ -14,8 +14,6 @@ - register: __sap_hana_preconfigure_register_yum_pseries_energy_assert - changed_when: no - ignore_errors: yes -- args: -- warn: false - - - name: Assert that package pseries-energy is not installed - ansible.builtin.assert: -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml.me 2022-11-24 16:09:30.351779764 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml 2022-11-24 16:09:51.607092047 +0100 -@@ -103,8 +103,6 @@ - ansible.builtin.shell: "{{ __sap_general_preconfigure_fact_yum_group_list_installed_command_assert }}" - register: __sap_general_preconfigure_register_yum_group_assert - changed_when: no -- args: -- warn: false - - - name: Assert that all required RHEL 7 package groups are installed - ansible.builtin.assert: -@@ -134,8 +132,6 @@ - ansible.builtin.shell: "{{ __sap_general_preconfigure_fact_yum_envgroup_list_installed_command_assert }}" - register: __sap_general_preconfigure_register_yum_envgroup_assert - changed_when: no -- args: -- warn: false - - - name: Assert that all required RHEL 8 environment groups are installed - ansible.builtin.assert: -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/installation.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/installation.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/installation.yml.me 2022-11-24 15:39:24.083358360 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_general_preconfigure/tasks/RedHat/installation.yml 2022-11-24 16:09:16.734569938 +0100 -@@ -104,10 +104,9 @@ - - sap_general_preconfigure_set_minor_release - - __sap_general_preconfigure_register_subscription_manager_release.stdout != ansible_distribution_version - --- name: Ensure that the required package groups are installed, RHEL 7 -+# Reason for noqa: The yum module appears to not support the check-update option -+- name: Ensure that the required package groups are installed, RHEL 7 # noqa command-instead-of-module - ansible.builtin.command: "yum install {{ sap_general_preconfigure_packagegroups|join(' ') }} -y" -- args: -- warn: false - register: __sap_general_preconfigure_register_yum_group_install - when: ansible_distribution_major_version == '7' - -@@ -116,11 +115,11 @@ - var: __sap_general_preconfigure_register_yum_group_install - when: ansible_distribution_major_version == '7' - --- name: Ensure that the required package groups are installed, RHEL 8 and RHEL 9 -+# Reason for noqa: The yum module appears to not support the check-update option -+- name: Ensure that the required package groups are installed, RHEL 8 and RHEL 9 # noqa command-instead-of-module - # Note: We want to avoid unwanted package upgrades, see bug 1983749. -+ - ansible.builtin.command: "yum install {{ sap_general_preconfigure_packagegroups|join(' ') }} --nobest --exclude=kernel* -y" -- args: -- warn: false - register: __sap_general_preconfigure_register_yum_group_install - when: ansible_distribution_major_version == '8' or ansible_distribution_major_version == '9' - -@@ -229,8 +228,6 @@ - register: __sap_general_preconfigure_register_needs_restarting - ignore_errors: true - changed_when: false -- args: -- warn: false - check_mode: false - - - name: Display the output of the reboot requirement check -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml.me 2022-11-24 16:29:58.053514750 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml 2022-11-24 16:30:25.886020641 +0100 -@@ -85,8 +85,6 @@ - ansible.builtin.shell: set -o pipefail && yum info installed {{ __sap_hana_preconfigure_required_ppc64le | map('quote') | join(' ') }} | awk '/Name/{n=$NF}/Version/{v=$NF}/Release/{r=$NF}/Description/{printf ("%s\n", n)}' - register: __sap_hana_preconfigure_register_required_ppc64le_packages_assert - changed_when: no -- args: -- warn: false - - - name: Assert that all required IBM packages are installed - ansible.builtin.assert: -@@ -223,8 +221,6 @@ - ansible.builtin.shell: "{{ __sap_hana_preconfigure_fact_needs_restarting_command_assert }}" - register: __sap_hana_preconfigure_register_needs_restarting_assert - changed_when: false -- args: -- warn: false - check_mode: false - ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors | d(false) }}" - -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/installation.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/installation.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/installation.yml.me 2022-11-24 16:29:34.036071972 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_hana_preconfigure/tasks/RedHat/installation.yml 2022-11-24 16:29:47.668325538 +0100 -@@ -205,8 +205,6 @@ - register: __sap_hana_preconfigure_register_needs_restarting - ignore_errors: true - changed_when: false -- args: -- warn: false - check_mode: false - - - name: Display the output of the reboot requirement check -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_ha_prepare_pacemaker/tasks/software_setup.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_ha_prepare_pacemaker/tasks/software_setup.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_ha_prepare_pacemaker/tasks/software_setup.yml.me 2022-11-24 16:11:35.901018559 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_ha_prepare_pacemaker/tasks/software_setup.yml 2022-11-24 16:29:19.834807820 +0100 -@@ -4,7 +4,6 @@ - yum repolist - args: - executable: /bin/bash -- warn: no - become: true - become_user: root - register: sap_ha_prepare_pacemaker_check_ha_repos -diff -up community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_netweaver_preconfigure/tasks/RedHat/assert-installation.yml.me community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_netweaver_preconfigure/tasks/RedHat/assert-installation.yml ---- community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_netweaver_preconfigure/tasks/RedHat/assert-installation.yml.me 2022-11-24 16:10:14.505495496 +0100 -+++ community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f/roles/sap_netweaver_preconfigure/tasks/RedHat/assert-installation.yml 2022-11-24 16:10:52.338204907 +0100 -@@ -12,12 +12,11 @@ - loop_var: line_item - ignore_errors: "{{ sap_netweaver_preconfigure_assert_ignore_errors | d(false) }}" - --- name: Check if required packages for Adobe Document Services are installed -+# Reason for noqa: The yum module appears to not support the check-update option -+- name: Check if required packages for Adobe Document Services are installed # noqa command-instead-of-module - ansible.builtin.shell: rpm -q --qf "%{NAME}.%{ARCH}\n" {{ __sap_netweaver_preconfigure_adobe_doc_services_packages | map('quote') | join(' ') }} - register: __sap_netweaver_preconfigure_register_rpm_q_ads_packages - changed_when: no -- args: -- warn: false - when: sap_netweaver_preconfigure_use_adobe_doc_services | d(false) - ignore_errors: "{{ sap_netweaver_preconfigure_assert_ignore_errors | d(false) }}" - diff --git a/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec index 46e6e38..31d34fe 100644 --- a/rhel-system-roles-sap.spec +++ b/rhel-system-roles-sap.spec @@ -26,27 +26,25 @@ # collection_version has to be increased by every rebuild # otherwise, it cannot be uploaded to Automation Hub and Galaxy # due to version conflict -%define collection_version 1.1.1 +%define collection_version 1.2.0 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0 -%global commit_id_sap_install a2c6785d02092bb9142d9f2c170ad4b097d1af2f +%global commit_id_sap_install d6756cbaed7657d6ca3508a97dcc3617e995999f %global rolename1 sap_general_preconfigure %global rolename2 sap_hana_preconfigure %global rolename3 sap_netweaver_preconfigure %global rolename4 sap_hana_install -%global rolename5 sap_ha_set_hana +%global rolename5 sap_ha_pacemaker_cluster %global rolename6 sap_ha_set_netweaver %global rolename7 sap_hostagent %global rolename8 sap_install_media_detect %global rolename9 sap_storage %global rolename10 sap_swpm %global rolename11 sap_ha_install_hana_hsr -%global rolename12 sap_ha_prepare_pacemaker -%global rolename13 sap_ha_install_pacemaker %global src_owner linux-system-roles %global github_repo_sap_install community.sap_install -%global rolename_rhel %{rolename1} %{rolename2} %{rolename3} %{rolename4} %{rolename5} %{rolename11} %{rolename12} %{rolename13} -%global rolename_community %{rolename_rhel} %{rolename1} %{rolename6} %{rolename7} %{rolename8} %{rolename9} %{rolename10} +%global rolename_rhel %{rolename1} %{rolename2} %{rolename3} %{rolename4} %{rolename5} %{rolename10} %{rolename11} +%global rolename_community %{rolename_rhel} %{rolename1} %{rolename6} %{rolename7} %{rolename8} %{rolename9} %if 0%{?fedora} %global rolenames %{rolename_community} %else @@ -55,8 +53,8 @@ Name: %{package_name} Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products -Version: 3.3.0 -Release: 5%{?dist} +Version: 3.4.0 +Release: 1%{?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 @@ -64,10 +62,6 @@ Source1: https://github.com/berndfinger/%{github_repo_sap_install}/archive/%{com Source4: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/README.md Source5: https://gitlab.cee.redhat.com/bfinger/build-redhat.sap_install/-/raw/main/galaxy.yml Patch1: community.sap_install-shebang.patch -Patch2: sap-hana-preconfigure-md2html-error.patch -Patch3: community.sap_install-warn-no-longer-supported.patch -Patch4: community.sap_install-ansible-lint-errors.patch -Patch5: community.sap_install-prepare-rhel-9x.patch BuildArch: noarch @@ -141,11 +135,9 @@ sed -i -e "s|^namespace: .*|namespace: %{collection_namespace}|" galaxy.yml sed -i -e "s|^version: .*|version: %{collection_version}|" 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 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 popd # remove zero file and symlinks @@ -242,6 +234,9 @@ popd %endif %changelog +* Tue Jan 10 2023 Than Ngo - 3.4.0-1 +- Resolves: #2155870, rebase to 1.2.0 upstream version + * Mon Nov 28 2022 Than Ngo - 3.3.0-5 - Related: #2143280, add missing repo vars for rhel-9.x diff --git a/sap-hana-preconfigure-md2html-error.patch b/sap-hana-preconfigure-md2html-error.patch deleted file mode 100644 index f3ace35..0000000 --- a/sap-hana-preconfigure-md2html-error.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up community.sap_install/roles/sap_hana_preconfigure/README.md.me community.sap_install/roles/sap_hana_preconfigure/README.md ---- community.sap_install/roles/sap_hana_preconfigure/README.md.me 2021-03-22 14:08:21.960414814 +0100 -+++ community.sap_install/roles/sap_hana_preconfigure/README.md 2021-03-22 14:10:28.220020075 +0100 -@@ -216,13 +216,13 @@ In case you want the role to set or chec - sap_hana_preconfigure_use_netapp_settings_nfsv3 - ``` - --### Add the repository for IBM service and productivity tools for POWER (ppc64le only) -+### Add the repository for IBM service and productivity tools (ppc64le only) - In case you do *not* want to automatically add the repository for the IBM service and productivity tools, set the following variable to `no`. Default is `yes`, meaning that the role will download and install the package specified in variable sap_hana_preconfigure_ibm_power_repo_url (see below) and also run the command /opt/ibm/lop/configure to accept the license. - ```yaml - sap_hana_preconfigure_add_ibm_power_repo - ``` - --### URL for IBM service and productivity tools for POWER (ppc64le only) -+### URL for IBM service and productivity tools (ppc64le only) - The following variable is set to the location of package ibm-power-repo-lastest.noarch.rpm or a package with similar contents, as defined by variable __sap_hana_preconfigure_ibm_power_repo_url in vars/RedHat_7.yml and vars/RedHat_8.yml. - You can replace it by your own URL by setting this variable to a different URL. - ```yaml diff --git a/sources b/sources index c27e637..903f5a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz) = 3d5c784e668605eb8b7862227b456da05ff5dedf84411131a27118b501b6a9bbe8894c4f29e6de4230fe534ef6b2de4653c56a904857d9eb11b452d31aed143c -SHA512 (community.sap_install-a2c6785d02092bb9142d9f2c170ad4b097d1af2f.tar.gz) = edc17df7e069a0085547db242f93183e93e2ca43351d4ffdfc2dc9a891e673adedb990ee2685874429208e94224e899a45058bc6d2171a76e945d4f460b6d7ab +SHA512 (community.sap_install-d6756cbaed7657d6ca3508a97dcc3617e995999f.tar.gz) = dfa4595ce6d30c26bc692f80362ae47648d0aff95a6994e573e8f32f6c03aca4035d4316fb03416034ae9b45511c66f60fb4349fd120aa5a435c03e00ddb65b2