Skip to content

Commit a03bae6

Browse files
committed
sap_netweaver_preconfigure: Sync with applicable SAP notes for Adobe DS
Solves issue sap-linuxlab#689. Further changes in this commit: - Add the SAP note numbers and versions in a comment before the list of packages in the RedHat*.yml files in vars. - Add 'ansible_architecture' as a condition in the related installation task, so that there is no task failure when running on another architecture than 'x86_64'. - Also revert back to the default of 'false' for the role variable 'sap_netweaver_preconfigure_use_adobe_doc_services'. See commit 384f4d8, PR sap-linuxlab#876. Signed-off-by: Bernd Finger <[email protected]>
1 parent 422df4b commit a03bae6

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

roles/sap_netweaver_preconfigure/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: true
1414

1515
sap_netweaver_preconfigure_rpath: '/usr/sap/lib'
1616

17-
sap_netweaver_preconfigure_use_adobe_doc_services: true
17+
sap_netweaver_preconfigure_use_adobe_doc_services: false
1818

1919
# (SUSE specific) Version of saptune to install.
2020
# It is recommended to install latest version by keeping this variable empty.

roles/sap_netweaver_preconfigure/tasks/RedHat/installation.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
state: present
77
name: "{{ __sap_netweaver_preconfigure_packages }}"
88

9-
- name: Ensure required packages for Adobe Document Services are installed
9+
- name: Ensure required packages for Adobe Document Services are installed, x86_64 only
1010
ansible.builtin.package:
1111
state: present
1212
name: "{{ __sap_netweaver_preconfigure_adobe_doc_services_packages }}"
13-
when: sap_netweaver_preconfigure_use_adobe_doc_services
13+
when:
14+
- ansible_architecture == 'x86_64'
15+
- sap_netweaver_preconfigure_use_adobe_doc_services

roles/sap_netweaver_preconfigure/vars/RedHat_7.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,34 @@ __sap_netweaver_preconfigure_sapnotes_versions:
1212
__sap_netweaver_preconfigure_packages:
1313
- tuned-profiles-sap
1414

15+
# SAP note 2135057 v11:
1516
__sap_netweaver_preconfigure_adobe_doc_services_packages:
1617
- autoconf.noarch
1718
- automake.noarch
1819
- cyrus-sasl.x86_64
1920
- expat.x86_64
2021
- fontconfig.x86_64
2122
- freetype.x86_64
22-
- glibc.x86_64
23-
- glibc-devel.x86_64
23+
- glibc.i686
24+
- glibc-devel.i686
2425
- keyutils-libs.x86_64
2526
- krb5-libs.x86_64
2627
- libcom_err.x86_64
27-
- libgcc.x86_64
28+
- libgcc.i686
2829
- libidn.x86_64
2930
- libidn-devel.x86_64
3031
- libselinux.x86_64
3132
- libssh2.x86_64
32-
- libX11.x86_64
33-
- libXau.x86_64
34-
- libxcb.x86_64
33+
- libX11.i686
34+
- libXau.i686
35+
- libxcb.i686
3536
- nspr.x86_64
3637
- nss.x86_64
3738
- nss-softokn.x86_64
38-
- nss-softokn-freebl.x86_64
39+
- nss-softokn-freebl.i686
3940
- nss-util.x86_64
4041
- openldap.x86_64
4142
- openssl.x86_64
4243
- transfig.x86_64
4344
- zlib.x86_64
44-
- libuuid.x86_64
45+
- libuuid.i686

roles/sap_netweaver_preconfigure/vars/RedHat_8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ __sap_netweaver_preconfigure_sapnotes_versions:
1414
__sap_netweaver_preconfigure_packages:
1515
- tuned-profiles-sap
1616

17+
# SAP note 2920407 v6:
1718
__sap_netweaver_preconfigure_adobe_doc_services_packages:
1819
- autoconf.noarch
1920
- automake.noarch
@@ -26,7 +27,6 @@ __sap_netweaver_preconfigure_adobe_doc_services_packages:
2627
- libcom_err.x86_64
2728
- libidn2.x86_64
2829
- libselinux.x86_64
29-
- libssh2.x86_64
3030
- libxcb.i686
3131
- nspr.x86_64
3232
- nss.x86_64

roles/sap_netweaver_preconfigure/vars/RedHat_9.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ __sap_netweaver_preconfigure_sapnotes_versions:
1212
__sap_netweaver_preconfigure_packages:
1313
- tuned-profiles-sap
1414

15+
# SAP note 3242422 v2:
1516
__sap_netweaver_preconfigure_adobe_doc_services_packages:
1617
- autoconf.noarch
1718
- automake.noarch
@@ -24,7 +25,6 @@ __sap_netweaver_preconfigure_adobe_doc_services_packages:
2425
- libcom_err.x86_64
2526
- libidn2.x86_64
2627
- libselinux.x86_64
27-
- libssh2.x86_64
2828
- libxcb.i686
2929
- nspr.x86_64
3030
- nss.x86_64

0 commit comments

Comments
 (0)