Skip to content

Commit f0deb28

Browse files
authored
Merge pull request #311 from sap-linuxlab/dev
Merge dev to main for release 1.2.1
2 parents d6756cb + 09a9389 commit f0deb28

File tree

16 files changed

+377
-135
lines changed

16 files changed

+377
-135
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.yml linguist-detectable

CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ community.sap_install Release Notes
66

77

88

9+
v1.2.1
10+
======
11+
12+
Release Summary
13+
---------------
14+
15+
| Release Date: 2022-01-26
16+
| A few minor fixes
17+
18+
919
v1.2.0
1020
======
1121

docs/developer_notes/sap_swmp_dev.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# sap_swpm Ansible Role DEVELOPER NOTES
22

3+
## Errors with missing signature files for installation media
4+
5+
After SWPM 1.0 SP22 and SAP SWPM 2.0 SP00, all SAP Software installation media requires a seperate signature file (SIGNATURE.SMF). The signature file is missing in older installation media.
6+
7+
For example, IDES for SAP ECC 6.0 EhP8. See the following error message and SAP Note 2622019 - "EXPORT_1 is not signed" error during IDES installation.
8+
```shell
9+
INFO
10+
DU at '/software_path/51052029_1/EXP1' is not signed.
11+
12+
WARNING
13+
Data unit '/software_path/51052029_1/EXP1' is not signed.
14+
DETAILS: The found data unit must not be used.
15+
SOLUTION: Ensure that you use the latest available version of Installation Export 1 ECC 6.0 EhP8 downloaded from the SAP Support Portal and ensure that its content is unchanged.
16+
Not accepted
17+
```
18+
19+
320
## SAP SWPM for SAP NWAS JAVA installations
421

522
There are two deployment methods executed for SAP SWPM for SAP NWAS JAVA, which uses two sequential executions:

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace: community
1010
name: sap_install
1111

1212
# The version of the collection. Must be compatible with semantic versioning
13-
version: 1.2.0
13+
version: 1.2.1
1414

1515
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
1616
readme: README.md

roles/sap_general_preconfigure/tasks/RedHat/installation.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,24 @@
109109
state: present
110110
when: ansible_distribution_major_version == '7'
111111

112-
# Note: We do not want package updates, see Red Hat bug 1983749.
113-
- name: Ensure that the required package groups are installed, RHEL 8 and RHEL 9
114-
ansible.builtin.dnf:
115-
name: "{{ sap_general_preconfigure_packagegroups }}"
116-
state: present
117-
exclude: kernel*
118-
nobest: true
112+
# Note: We do not want package updates, see also Red Hat bug 1983749.
113+
# Because the installation of an environment or package group is not guaranteed to avoid package updates,
114+
# and because of bug 2011426 (for which the fix is not available in the RHEL 8.1 ISO image), a RHEL 8.1
115+
# system might not boot after installing environment group Server.
116+
- name: Ensure that the required package groups are installed, RHEL 8 and RHEL 9 # noqa command-instead-of-module
117+
ansible.builtin.command: "yum install {{ sap_general_preconfigure_packagegroups | join(' ') }} --nobest --exclude=kernel* -y"
119118
register: __sap_general_preconfigure_register_yum_group_install
120119
when: ansible_distribution_major_version == '8' or ansible_distribution_major_version == '9'
121120

121+
# possible replacement once we no longer need Ansible 2.9 compatibility:
122+
#- name: Ensure that the required package groups are installed, RHEL 8 and 9
123+
# ansible.builtin.package:
124+
# name: "{{ sap_general_preconfigure_packagegroups }}"
125+
# state: present
126+
# nobest: true # supported from Ansible 2.11
127+
# register: __sap_general_preconfigure_register_yum_group_install
128+
# when: ansible_distribution_major_version == '8' or ansible_distribution_major_version == '9'
129+
122130
- name: Ensure that the required packages are installed
123131
ansible.builtin.package:
124132
name: "{{ sap_general_preconfigure_packages }}"

roles/sap_install_media_detect/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sap_install_media_detect_igs: true
1515
sap_install_media_detect_kernel: true
1616
sap_install_media_detect_webdisp: false
1717

18-
# saps4hana, sapecc, sapbw4hana, sapnwas_abap, sapnwas_java
18+
# saps4hana, sapecc, sapecc_ides, sapbw4hana, sapnwas_abap, sapnwas_java
1919
sap_install_media_detect_export:
2020

2121
# e.g. /db_backup
Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
---
2+
3+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Create Directories
4+
ansible.builtin.file:
5+
path: "{{ item }}"
6+
state: directory
7+
mode: '0755'
8+
owner: root
9+
group: root
10+
with_items:
11+
- "{{ sap_install_media_detect_directory }}/sapecc_ides_export/"
12+
- "{{ sap_install_media_detect_directory }}/sapecc_ides_export_extracted/"
13+
14+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - List files in directory
15+
ansible.builtin.shell: ls -1
16+
register: detect_directory_files
17+
args:
18+
chdir: "{{ sap_install_media_detect_directory }}"
19+
20+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Detect ZIP files (including no file extensions), ignore errors
21+
ansible.builtin.shell: if [ ! -z "$(file {{ item }} | grep 'Zip archive data')" ]; then echo {{ item }}; fi
22+
register: detect_directory_files_zip
23+
# changed_when: "item.stdout | length > 0"
24+
with_items:
25+
- "{{ detect_directory_files.stdout_lines }}"
26+
args:
27+
chdir: "{{ sap_install_media_detect_directory }}"
28+
ignore_errors: true
29+
30+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Detect RAR files (including no file extensions), ignore errors
31+
ansible.builtin.shell: if [ ! -z "$(file {{ item }} | grep 'RAR')" ]; then echo {{ item }}; fi
32+
register: detect_directory_files_rar
33+
# changed_when: "item.stdout | length > 0"
34+
with_items:
35+
- "{{ detect_directory_files.stdout_lines }}"
36+
args:
37+
chdir: "{{ sap_install_media_detect_directory }}"
38+
ignore_errors: true
39+
40+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Identify SAP ECC IDES EXPORT files
41+
ansible.builtin.shell: |
42+
if [ ! -z "$(file {{ item }} | grep 'Zip archive data')" ]; then if zipinfo -1 {{ item }} | grep -Eq '*EXP[0-9]' ; then echo '{{ item }}' ; fi ;
43+
elif [ ! -z "$(file {{ item }} | grep 'RAR')" ]; then if "{{ sap_install_media_detect_unrar_binary }}" lb {{ item }} | grep -Eq '*EXP[0-9]' ; then echo '{{ item }}' ; fi ; fi
44+
register: detect_directory_files_ecc_export
45+
changed_when: "item | length > 0"
46+
with_items:
47+
- "{{ detect_directory_files_zip.results | map(attribute='stdout') | select() }}"
48+
- "{{ detect_directory_files_rar.results | map(attribute='stdout') | select() }}"
49+
args:
50+
chdir: "{{ sap_install_media_detect_directory }}"
51+
52+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - If any ZIP, then extract the SAP ECC Installation Export file (unzip)
53+
ansible.builtin.shell: if [ ! -z "$(file {{ item }} | grep 'Zip archive data')" ]; then unzip {{ item }} -d ./sapecc_ides_export_extracted ; fi
54+
with_items:
55+
- "{{ detect_directory_files_ecc_export.results | map(attribute='stdout') | select() }}"
56+
args:
57+
chdir: "{{ sap_install_media_detect_directory }}"
58+
59+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - If any RAR without file extension, then add file extension (for use with unrar binary)
60+
ansible.builtin.shell: if [ ! -z "$(file {{ item }} | grep 'RAR archive data')" ]; then filename="{{ item }}" && if [ "${filename##*.}" != "rar" ]; then mv {{ item }} {{ item }}.rar ; fi ; fi
61+
with_items:
62+
- "{{ detect_directory_files_ecc_export.results | map(attribute='stdout') | select() }}"
63+
args:
64+
chdir: "{{ sap_install_media_detect_directory }}"
65+
66+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Find self-extracting RAR EXE (parent RAR file) and extract SAP ECC Installation Export files (unrar x)
67+
ansible.builtin.shell: if [ ! -z "$(file {{ item }} | grep 'RAR self-extracting archive')" ]; then "{{ sap_install_media_detect_unrar_binary }}" x "{{ item }}" sapecc_ides_export_extracted/ ; fi
68+
with_items:
69+
- "{{ detect_directory_files_ecc_export.results | map(attribute='stdout') | select() }}"
70+
args:
71+
chdir: "{{ sap_install_media_detect_directory }}"
72+
73+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Identify SAP ECC IDES EXPORT extracted
74+
ansible.builtin.find:
75+
paths: "{{ sap_install_media_detect_directory }}/sapecc_ides_export_extracted"
76+
recurse: yes
77+
file_type: directory
78+
# contains: "*EXP"
79+
patterns: '.*EXP.*'
80+
use_regex: yes
81+
register: detect_directory_export_extracted
82+
83+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Local Directory source - re-list files in directory
84+
ansible.builtin.shell: ls -1
85+
register: detect_directory_files
86+
args:
87+
chdir: "{{ sap_install_media_detect_directory }}"
88+
when:
89+
- sap_install_media_detect_source == "local_dir"
90+
91+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Local Directory source - re-detect ZIP files (including no file extensions), ignore errors
92+
ansible.builtin.shell: if [ ! -z "$(file {{ item }} | grep 'Zip archive data')" ]; then echo {{ item }}; fi
93+
register: detect_directory_files_zip_repeated
94+
# changed_when: "item.stdout | length > 0"
95+
with_items:
96+
- "{{ detect_directory_files.stdout_lines }}"
97+
args:
98+
chdir: "{{ sap_install_media_detect_directory }}"
99+
ignore_errors: true
100+
when:
101+
- sap_install_media_detect_source == "local_dir"
102+
103+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Local Directory source - re-detect RAR files (including no file extensions), ignore errors
104+
ansible.builtin.shell: if [ ! -z "$(file {{ item }} | grep 'RAR')" ]; then echo {{ item }}; fi
105+
register: detect_directory_files_rar_repeated
106+
# changed_when: "item.stdout | length > 0"
107+
with_items:
108+
- "{{ detect_directory_files.stdout_lines }}"
109+
args:
110+
chdir: "{{ sap_install_media_detect_directory }}"
111+
ignore_errors: true
112+
when:
113+
- sap_install_media_detect_source == "local_dir"
114+
115+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Local Directory source - re-identify SAP ECC IDES EXPORT files
116+
ansible.builtin.shell: |
117+
if [ ! -z "$(file {{ item }} | grep 'Zip archive data')" ]; then if zipinfo -1 {{ item }} | grep -Eq '*EXP[0-9]' ; then echo '{{ item }}' ; fi ;
118+
elif [ ! -z "$(file {{ item }} | grep 'RAR')" ]; then if "{{ sap_install_media_detect_unrar_binary }}" lb {{ item }} | grep -Eq '*EXP[0-9]' ; then echo '{{ item }}' ; fi ; fi
119+
register: detect_directory_files_ecc_export_repeated
120+
changed_when: "item | length > 0"
121+
with_items:
122+
- "{{ detect_directory_files_zip_repeated.results | map(attribute='stdout') | select() }}"
123+
- "{{ detect_directory_files_rar_repeated.results | map(attribute='stdout') | select() }}"
124+
args:
125+
chdir: "{{ sap_install_media_detect_directory }}"
126+
when:
127+
- sap_install_media_detect_source == "local_dir"
128+
129+
- name: SAP Install Media Detect - SAP ECC IDES EXPORT - Local Directory source - move SAP ECC IDES EXPORT compressed archive files
130+
command: mv "{{ sap_install_media_detect_directory }}/{{ item }}" "{{ sap_install_media_detect_directory }}/sapecc_ides_export/{{ item }}"
131+
with_items:
132+
- "{{ detect_directory_files_ecc_export_repeated.results | map(attribute='stdout') | select() }}"
133+
when:
134+
- sap_install_media_detect_source == "local_dir"

roles/sap_install_media_detect/tasks/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@
7171
when:
7272
- sap_install_media_detect_export == "sapecc"
7373

74+
- name: SAP Install Media Detect - EXPORT files for SAP ECC IDES
75+
include_tasks: "detect_export_sapecc_ides.yml"
76+
when:
77+
- sap_install_media_detect_export == "sapecc_ides"
78+
7479
- name: SAP Install Media Detect - EXPORT files for SAP S/4HANA
7580
include_tasks: "detect_export_saps4hana.yml"
7681
when:

roles/sap_install_media_detect/tasks/set_global_vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
sap_swpm_cd_export_path: "{{ detect_directory_export_extracted.files[0].path }}" # for sap_swpm Ansible Role
4747
ignore_errors: true
4848
when:
49-
- sap_install_media_detect_export == "sapecc"
49+
- sap_install_media_detect_export == "sapecc" or sap_install_media_detect_export == "sapecc_ides"
5050

5151
- name: SAP Install Media Detection Completed - set facts for Export of SAP S/4HANA
5252
ansible.builtin.set_fact:

roles/sap_netweaver_preconfigure/tasks/sapnote/3119751.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,23 @@
55
msg: "SAP note {{ (__sap_netweaver_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3119751$') | first).number }}
66
(version {{ (__sap_netweaver_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3119751$') | first).version }}): Linux Requirements for SAP Kernel 754 and for SAP Kernel 788 and higher"
77

8-
- name: Create directory "{{ sap_netweaver_preconfigure_rpath }}"
8+
- name: Get info about the compat-sap-c++-10.so file
9+
ansible.builtin.stat:
10+
path: /opt/rh/SAP/lib64/compat-sap-c++-10.so
11+
register: __sap_netweaver_preconfigure_register_stat_compat_sap_cpp
12+
13+
- name: Create directory '{{ sap_netweaver_preconfigure_rpath }}'
914
ansible.builtin.file:
1015
path: "{{ sap_netweaver_preconfigure_rpath }}"
1116
state: directory
1217
owner: root
1318
group: root
1419
mode: '0755'
20+
when: __sap_netweaver_preconfigure_register_stat_compat_sap_cpp.stat.exists
1521

16-
- name: Create a link to libstdc++.so.6
22+
- name: Create a link to '{{ sap_netweaver_preconfigure_rpath }}libstdc++.so.6'
1723
ansible.builtin.file:
1824
src: /opt/rh/SAP/lib64/compat-sap-c++-10.so
1925
dest: "{{ sap_netweaver_preconfigure_rpath }}/libstdc++.so.6"
2026
state: link
27+
when: __sap_netweaver_preconfigure_register_stat_compat_sap_cpp.stat.exists

0 commit comments

Comments
 (0)