|
 |
c7164b |
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
|
|
|
c7164b |
--- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml.me 2022-05-23 20:03:38.155660382 +0200
|
|
|
c7164b |
+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml 2022-05-23 20:06:38.667894467 +0200
|
|
|
c7164b |
@@ -18,14 +18,26 @@
|
|
|
c7164b |
__sap_general_preconfigure_req_ha_repos: ''
|
|
|
c7164b |
when: not sap_general_preconfigure_use_ha_repos
|
|
|
c7164b |
|
|
|
c7164b |
- - name: Assert - Set final list of repos, auto
|
|
|
c7164b |
+ - name: Assert - Set final list of repos, non-s390x, auto
|
|
|
c7164b |
set_fact:
|
|
|
c7164b |
__sap_general_preconfigure_req_repos:
|
|
|
c7164b |
"{{ __sap_general_preconfigure_req_os_repos | list }} +
|
|
|
c7164b |
{{ __sap_general_preconfigure_req_netweaver_repos | list }} +
|
|
|
c7164b |
{{ __sap_general_preconfigure_req_hana_repos | list }} +
|
|
|
c7164b |
{{ __sap_general_preconfigure_req_ha_repos | list }}"
|
|
|
c7164b |
- when: sap_general_preconfigure_req_repos is undefined
|
|
|
c7164b |
+ when:
|
|
|
c7164b |
+ - sap_general_preconfigure_req_repos is undefined
|
|
|
c7164b |
+ - ansible_architecture != 's390x'
|
|
|
c7164b |
+
|
|
|
c7164b |
+ - name: Assert - Set final list of repos, s390x, auto
|
|
|
c7164b |
+ set_fact:
|
|
|
c7164b |
+ __sap_general_preconfigure_req_repos:
|
|
|
c7164b |
+ "{{ __sap_general_preconfigure_req_os_repos | list }} +
|
|
|
c7164b |
+ {{ __sap_general_preconfigure_req_netweaver_repos | list }} +
|
|
|
c7164b |
+ {{ __sap_general_preconfigure_req_ha_repos | list }}"
|
|
|
c7164b |
+ when:
|
|
|
c7164b |
+ - sap_general_preconfigure_req_repos is undefined
|
|
|
c7164b |
+ - ansible_architecture == 's390x'
|
|
|
c7164b |
|
|
|
c7164b |
- name: Assert - Set final list of repos, manual
|
|
|
c7164b |
set_fact:
|
|
|
c7164b |
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
|
|
|
c7164b |
--- community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml.me 2022-05-23 20:07:10.469897468 +0200
|
|
|
c7164b |
+++ community.sap_install-57211739079e4ef37f51c45c30ea071c0956ad32/roles/sap_general_preconfigure/tasks/RedHat/installation.yml 2022-05-23 20:08:27.072770838 +0200
|
|
|
c7164b |
@@ -18,14 +18,26 @@
|
|
|
c7164b |
__sap_general_preconfigure_req_ha_repos: ''
|
|
|
c7164b |
when: not sap_general_preconfigure_use_ha_repos
|
|
|
c7164b |
|
|
|
c7164b |
- - name: Set final list of repos, auto
|
|
|
c7164b |
+ - name: Set final list of repos, non-s390x, auto
|
|
|
c7164b |
set_fact:
|
|
|
c7164b |
__sap_general_preconfigure_req_repos:
|
|
|
c7164b |
"{{ __sap_general_preconfigure_req_os_repos | list }} +
|
|
|
c7164b |
{{ __sap_general_preconfigure_req_netweaver_repos | list }} +
|
|
|
c7164b |
{{ __sap_general_preconfigure_req_hana_repos | list }} +
|
|
|
c7164b |
{{ __sap_general_preconfigure_req_ha_repos | list }}"
|
|
|
c7164b |
- when: sap_general_preconfigure_req_repos is undefined
|
|
|
c7164b |
+ when:
|
|
|
c7164b |
+ - sap_general_preconfigure_req_repos is undefined
|
|
|
c7164b |
+ - ansible_architecture != 's390x'
|
|
|
c7164b |
+
|
|
|
c7164b |
+ - name: Set final list of repos, s390x, auto
|
|
|
c7164b |
+ set_fact:
|
|
|
c7164b |
+ __sap_general_preconfigure_req_repos:
|
|
|
c7164b |
+ "{{ __sap_general_preconfigure_req_os_repos | list }} +
|
|
|
c7164b |
+ {{ __sap_general_preconfigure_req_netweaver_repos | list }} +
|
|
|
c7164b |
+ {{ __sap_general_preconfigure_req_ha_repos | list }}"
|
|
|
c7164b |
+ when:
|
|
|
c7164b |
+ - sap_general_preconfigure_req_repos is undefined
|
|
|
c7164b |
+ - ansible_architecture == 's390x'
|
|
|
c7164b |
|
|
|
c7164b |
- name: Set final list of repos, manual
|
|
|
c7164b |
set_fact:
|