diff --git a/community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch b/community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch new file mode 100644 index 0000000..a9a4890 --- /dev/null +++ b/community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch @@ -0,0 +1,64 @@ +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/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec index 0572b51..fb99386 100644 --- a/rhel-system-roles-sap.spec +++ b/rhel-system-roles-sap.spec @@ -26,14 +26,22 @@ # 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.2 +%define collection_version 1.0.3 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0 %global commit_id_sap_install 57211739079e4ef37f51c45c30ea071c0956ad32 %global rolename1 sap_general_preconfigure %global rolename2 sap_hana_preconfigure %global rolename3 sap_netweaver_preconfigure -%global rolename4 sap_hana_install +%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 src_owner linux-system-roles %global github_repo_sap_install community.sap_install @@ -50,7 +58,10 @@ 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 # patches 100-149 for sap-netweaver-preconfigur +# patches 150-199 for sap_general_preconfigure +Patch150: community.sap_install-be6ec7e34a25f078a7fc49166ad2e2a1dc6fc3e4-#135.patch BuildArch: noarch @@ -127,6 +138,10 @@ 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 +popd +pushd %{github_repo_sap_install}-%{commit_id_sap_install}/ +%patch150 -p1 popd pushd %{github_repo_sap_install}-%{commit_id_sap_install}/roles/ @@ -149,22 +164,25 @@ 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 - new_role="$(echo ${role/sap-/} | tr '-' '_')" - python3 lsr_role2collection.py --role "$role" \ +%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" \ - --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" + --new-role "$new_role" done rm -f .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/sanity/ignore-2.9.txt @@ -229,6 +247,9 @@ popd %endif %changelog +* Wed Jun 08 2022 Than Ngo - 3.2.0-4 +- Related: #2065407, __sap_hana_preconfigure_uefi_boot_dir undefined variable, do not attempt to enable HANA repos for s390x + * Sun Mar 13 2022 Than Ngo - 3.2.0-3 - Resolves: #2065407, new rebase diff --git a/sap_hana_preconfigure-fix-issue-#153.patch b/sap_hana_preconfigure-fix-issue-#153.patch new file mode 100644 index 0000000..22551da --- /dev/null +++ b/sap_hana_preconfigure-fix-issue-#153.patch @@ -0,0 +1,12 @@ +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) }}"