Skip to content

Commit 4368805

Browse files
KimForssUncleBatsRickmargesMarges, RSY (Rick)Kimmo Forss
authored
v 3.4.1 release (#201)
* Set default network rule action based on configuration (#177) * set conditional network default action * set conditional network default action * Fix all ansible-lint failures (#184) Co-authored-by: Marges, RSY (Rick) <Rick.Marges@achmea.nl> * Bug/fix pep subnet (#176) (#181) * if pep is used then don't use subnet exclusion * when pep dont use subnet * Revert "Fix all ansible-lint failures (#184)" (#185) This reverts commit c4e4288. * Remove BOM Catalog/archive from linting * remove the "is true" as unneeded * pipeline update and linting * Fix ansible-lint errors (#188) * Add bom_processing_become variable to BOM template processing * new updates to BOM files based on updated releases from SWPM and SUM * Obsolete * remove obsolete code * Bug/sa networkrules (#189) * merged storage account bootdiag with network_rules * merged storage account witness with network_rules * merged storage account transport with network_rules * merged storage account media with network_rules * use env vars instead of pipeline due to secret not working (#186) * use env vars instead of pipeline due to secret not working * fix secrets the same way in controlplane and system * Update 01-deploy-control-plane.yaml * Update 01-deploy-control-plane.yaml 2 changes crossed eachother, fixed the wrong merge now * Terraform Updates * Add custom umask (#190) * Additional umask's * HANA HSR without direct root SSH access (#182) * Fix hacluster (#191) * Fix for task path * Add task to create temp dir * Fix for async task * Use the correct virtual host for the app install * Fix to do post SCS HA install check from ansible controller * Make SCS and ERS filesystem resource device variable * Landscape keyvault without deployer or private endpoint Co-authored-by: Marges, RSY (Rick) <Rick.Marges@achmea.nl> * SSH communication between pacemaker nodes on RHEL isn't required (#183) (#192) * Resolve blocks without task name (#194) * Misc fixes releated to private endpoints and ansible linting * Set become flag * don't use the variable to control become * linting * ORACLE linting * use environment variable for client-secret (#197) * Linting and globbing fixes. Disabling SELinux * Use HANA vmname instead of secondary dnsname for single nic deployments (#196) * Linting * notify handlers to restart vm after selinux policy is changed. * skip lint check for 2.10.1.1 tasks with pipeline symbol in them * Fix lint (#199) * few changes * meta with fcqn * NW BoM Updates * Renamed the JINJA template for Netweaver * enable purge_soft_delete on destroy based on configuration (#200) * ToDo * set default scs_server_count for json to 0 * Template Updates (variable renames) * Bugfixes (#202) * Fix lint (#199) * NW BoM Updates * meta with fcqn * Renamed the JINJA template for Netweaver * enable purge_soft_delete on destroy based on configuration (#200) * Apply fix for grub config * Fix node tier for filesystems Co-authored-by: Kimmo Forss <kimforss@microsoft.com> Co-authored-by: hdamecharla <hdamecharla@microsoft.com> Co-authored-by: Erick Segaar <33801297+ErickSegaar@users.noreply.github.com> Co-authored-by: Erick Segaar <33801297+ErickSegaar@users.noreply.github.com> Co-authored-by: Rickmarges <rickmarges@gmail.com> Co-authored-by: Marges, RSY (Rick) <Rick.Marges@achmea.nl> Co-authored-by: Kimmo Forss <kimforss@microsoft.com> Co-authored-by: hdamecharla <hdamecharla@microsoft.com> Co-authored-by: Harm Jan Stam <harmjan+git@harmjan.com>
1 parent 12d6faa commit 4368805

236 files changed

Lines changed: 1912 additions & 2619 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ansible-lint‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
exclude_paths:
22
- deploy/pipelines
3+
- deploy/ansible/BOM-catalog
34
- deploy/terraform
45
- .github
6+
# added ansible_skip_lint tag to exclude the task rather than the whole file.
7+
# - deploy/ansible/roles-sap-os/2.10-sap-notes/tasks/2.10.1.1.yaml # Has to be excluded as there is a pipe sign in the regex that Ansible sees as filter
58

69
warn_list:
710
# FIXME: Experimental violations should be fixed in separate PR
811
- experimental
912

1013
skip_list:
1114
# Ignored because there is no easier way to do
12-
- empty-string-compare
15+
- no-handler
1316

1417
# Following are ignored because of readability:
15-
- line-length
16-
- comments
17-
- comments-indentation
18-
- colons
19-
- commas
20-
- braces
21-
- hyphens
18+
- no-changed-when
2219
- role-name
2320
- var-naming
24-
- no-changed-when
21+
- yaml[braces]
22+
- yaml[colons]
23+
- yaml[commas]
24+
- yaml[line-length]
2525

26-
#csh is not supported in command
26+
# csh is not supported in command
2727
- command-instead-of-shell

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.sh text eol=lf
66
*.tfvars text eol=lf
77
*.tf text eol=lf
8+
*.tmpl text eol=lf
89
*.yml text eol=lf
910
*.yaml text eol=lf
1011
*.jpg -text

‎deploy/ansible/BOM-catalog/BW4HANA2021SPS01_v0003ms/templates/BW4HANA2021SPS01_v0002ms-dbload-inifile-param.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ nwUsers.sidAdmUID = {{ sidadm
2626

2727
NW_Delete_Sapinst_Users.removeUsers = true
2828
NW_GetMasterPassword.masterPwd = {{ main_password }}
29-
NW_GetSidNoProfiles.sid = {{ sap_sid|upper }}
29+
NW_GetSidNoProfiles.sid = {{ sap_sid| upper }}
3030

3131
NW_SCS_Instance.ascsInstallGateway = true
3232
NW_SCS_Instance.ascsInstallWebDispatcher = false
@@ -50,14 +50,14 @@ NW_HDB_DB.abapSchemaName = SAPHANAD
5050
NW_HDB_DB.abapSchemaPassword = {{ main_password }}
5151
NW_HDB_DBClient.clientPathStrategy = SAPCPE
5252
NW_HDB_getDBInfo.dbhost = {{ sap_db_hostname }}
53-
NW_HDB_getDBInfo.dbsid = {{ db_sid|upper }}
53+
NW_HDB_getDBInfo.dbsid = {{ db_sid| upper }}
5454
NW_HDB_getDBInfo.instanceNumber = {{ hdb_instance_number }}
5555
NW_HDB_getDBInfo.systemDbPassword = {{ main_password }}
5656
NW_HDB_getDBInfo.systemPassword = {{ main_password }}
57-
NW_HDB_getDBInfo.systemid = {{ db_sid|upper }}
57+
NW_HDB_getDBInfo.systemid = {{ db_sid| upper }}
5858
NW_HDB_getDBInfo.usingSSL = true
5959

60-
NW_Recovery_Install_HDB.extractLocation = /hana/backup/{{ db_sid|upper }}/HDB{{ hdb_instance_number }}/backup/data/DB_{{ db_sid|upper }}{{ hdb_instance_number }}
60+
NW_Recovery_Install_HDB.extractLocation = /hana/backup/{{ db_sid| upper }}/HDB{{ hdb_instance_number }}/backup/data/DB_{{ db_sid| upper }}{{ hdb_instance_number }}
6161

6262
NW_Recovery_Install_HDB.extractParallelJobs = 24
6363
NW_Recovery_Install_HDB.sidAdmName = {{ db_sid|lower }}adm

‎deploy/ansible/BOM-catalog/BW4HANA2021SPS01_v0003ms/templates/BW4HANA2021SPS01_v0002ms-pas-inifile-param.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ nwUsers.sidAdmUID = {{ sidadm
2727

2828
NW_Delete_Sapinst_Users.removeUsers = true
2929
NW_GetMasterPassword.masterPwd = {{ main_password }}
30-
NW_GetSidNoProfiles.sid = {{ sap_sid|upper }}
30+
NW_GetSidNoProfiles.sid = {{ sap_sid| upper }}
3131

3232
NW_SCS_Instance.ascsInstallGateway = true
3333
NW_SCS_Instance.ascsInstallWebDispatcher = false
@@ -45,14 +45,14 @@ NW_HDB_DB.abapSchemaName = SAPHANAD
4545
NW_HDB_DB.abapSchemaPassword = {{ main_password }}
4646
NW_HDB_DBClient.clientPathStrategy = SAPCPE
4747
NW_HDB_getDBInfo.dbhost = {{ sap_db_hostname }}
48-
NW_HDB_getDBInfo.dbsid = {{ db_sid|upper }}
48+
NW_HDB_getDBInfo.dbsid = {{ db_sid| upper }}
4949
NW_HDB_getDBInfo.instanceNumber = {{ hdb_instance_number }}
5050
NW_HDB_getDBInfo.systemDbPassword = {{ main_password }}
5151
NW_HDB_getDBInfo.systemPassword = {{ main_password }}
52-
NW_HDB_getDBInfo.systemid = {{ db_sid|upper }}
52+
NW_HDB_getDBInfo.systemid = {{ db_sid| upper }}
5353
NW_HDB_getDBInfo.usingSSL = true
5454

55-
NW_Recovery_Install_HDB.extractLocation = /usr/sap/{{ db_sid|upper }}/{{ db_sid|upper }}{{ hdb_instance_number }}/backup/data/DB_HDB
55+
NW_Recovery_Install_HDB.extractLocation = /usr/sap/{{ db_sid| upper }}/{{ db_sid| upper }}{{ hdb_instance_number }}/backup/data/DB_HDB
5656
NW_Recovery_Install_HDB.extractParallelJobs = 24
5757
NW_Recovery_Install_HDB.sidAdmName = {{ db_sid|lower }}adm
5858
NW_Recovery_Install_HDB.sidAdmPassword = {{ main_password }}

‎deploy/ansible/BOM-catalog/BW4HANA2021SPS01_v0003ms/templates/BW4HANA2021SPS01_v0002ms-web-inifile-param.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ NW_GetMasterPassword.masterPwd = {{ main_
2525
NW_adaptProfile.skipSecurityProfileSettings = true
2626
NW_getFQDN.FQDN = {{ sap_fqdn }}
2727

28-
NW_GetSidNoProfiles.sid = {{ sap_sid|upper }}
29-
NW_webdispatcher_Instance.backEndSID = {{ sap_sid|upper }}
28+
NW_GetSidNoProfiles.sid = {{ sap_sid| upper }}
29+
NW_webdispatcher_Instance.backEndSID = {{ sap_sid| upper }}
3030

3131
NW_Webdispatcher_Instance.wdInstanceNumber = {{ web_instance_number }}
3232
NW_webdispatcher_Instance.activateICF = false

‎deploy/ansible/BOM-catalog/NW750SPS20_v0004ms/NW750SPS20_v0004ms.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ product_ids:
2222
materials:
2323
dependencies:
2424
- name: HANA_2_00_059_v0002ms
25-
- name: SWPM10SP34_latest
26-
- name: SUM20SP13_latest
25+
- name: SWPM10SP35_latest
26+
- name: SUM20SP14_latest
2727

2828
media:
2929
# Kernel

‎deploy/ansible/BOM-catalog/NW750SPS20_v0004ms/templates/NW750SPS20_v0004ms-dbload-inifile-param.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ NW_HDB_DB.abapSchemaName = SAPABAP1
4040
NW_HDB_DB.abapSchemaPassword = {{ main_password }}
4141
NW_HDB_DBClient.clientPathStrategy = SAPCPE
4242
NW_HDB_getDBInfo.dbhost = {{ sap_db_hostname }}
43-
NW_HDB_getDBInfo.dbsid = {{ db_sid|upper }}
43+
NW_HDB_getDBInfo.dbsid = {{ db_sid| upper }}
4444
NW_HDB_getDBInfo.instanceNumber = {{ hdb_instance_number }}
4545
NW_HDB_getDBInfo.systemDbPassword = {{ main_password }}
4646
NW_HDB_getDBInfo.systemPassword = {{ main_password }}
47-
NW_HDB_getDBInfo.systemid = {{ db_sid|upper }}
47+
NW_HDB_getDBInfo.systemid = {{ db_sid| upper }}
4848
NW_HDB_getDBInfo.usingSSL = true
4949

50-
NW_Recovery_Install_HDB.extractLocation = /hana/backup/{{ db_sid|upper }}/HDB{{ hdb_instance_number }}/backup/data/DB_{{ db_sid|upper }}{{ hdb_instance_number }}
50+
NW_Recovery_Install_HDB.extractLocation = /hana/backup/{{ db_sid| upper }}/HDB{{ hdb_instance_number }}/backup/data/DB_{{ db_sid| upper }}{{ hdb_instance_number }}
5151

5252
NW_checkMsgServer.abapMSPort = 36{{ scs_instance_number }}
5353
NW_getLoadType.loadType = SAP

‎deploy/ansible/BOM-catalog/NW750SPS20_v0004ms/templates/NW750SPS20_v0004ms-generic-inifile-param.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
########################################################################################################################################################################################################
1010

1111

12-
NW_Users_Create.dbsid = {{ sap_sid|upper }}
12+
NW_Users_Create.dbsid = {{ sap_sid| upper }}
1313

1414
# Specify whether you are preparing for an SAP sytem based on AS ABAP.
1515
NW_Users_Create.hasABAP = true
@@ -18,7 +18,7 @@ NW_Users_Create.hasABAP = true
1818
NW_Users_Create.installDBUsers = false
1919

2020
# SAP system ID
21-
NW_Users_Create.sid = {{ sap_sid|upper }}
21+
NW_Users_Create.sid = {{ sap_sid| upper }}
2222

2323
nwUsers.sapadmUID = {{ sapadm_uid }}
2424
nwUsers.sapsysGID = {{ sapsys_gid }}

deploy/ansible/BOM-catalog/NW750SPS20_v0004ms/templates/NW750SPS20_v004gms-scsha-inifile-param.j2 renamed to deploy/ansible/BOM-catalog/NW750SPS20_v0004ms/templates/NW750SPS20_v0004ms-scsha-inifile-param.j2

File renamed without changes.

‎deploy/ansible/BOM-catalog/NW752SPS09_v0001ms/NW752SPS09_v0001ms.yaml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
name: "NW752SPS09_v0001ms"
44
target: "NETWEAVER 7.52 SPS 09"
5+
version: 1
56

67
defaults:
78
target_location: "{{ target_media_location }}/download_basket"
@@ -20,49 +21,49 @@ product_ids:
2021

2122
materials:
2223
dependencies:
23-
- name: HANA_2_00_059_v0002ms
24-
- name: SWPM10SP34_latest
25-
- name: SUM20SP13_latest
24+
- name: HANA_2_00_061_v0001ms
25+
- name: SWPM10SP35_latest
26+
- name: SUM20SP14_latest
2627

2728
media:
2829

2930
# kernel components
3031

3132
- name: "Kernel Part II (753)"
32-
archive: SAPEXEDB_900-80002572.SAR
33-
checksum: 83eb0450e30e7cefb09aa3def0a3f7f0bdbf5b2ee1ccbe481443084f50f98e37
33+
archive: SAPEXEDB_900-80002572.SAR
34+
checksum: 83eb0450e30e7cefb09aa3def0a3f7f0bdbf5b2ee1ccbe481443084f50f98e37
3435
url: https://softwaredownloads.sap.com/file/0020000001557752021
35-
path: download_basket
36+
path: download_basket
3637

3738
- name: "Kernel Part I (753)"
38-
archive: SAPEXE_900-80002573.SAR
39-
checksum: f5755f3df7be0bd0f1f07c959bc55c806a51ba3131287c568c2535bd8fdf713d
39+
archive: SAPEXE_900-80002573.SAR
40+
checksum: f5755f3df7be0bd0f1f07c959bc55c806a51ba3131287c568c2535bd8fdf713d
4041
url: https://softwaredownloads.sap.com/file/0020000001557032021
41-
path: download_basket
42+
path: download_basket
4243

4344
- name: "SAP HOST AGENT 7.22 SP54"
44-
archive: SAPHOSTAGENT54_54-80004822.SAR
45-
checksum: 5899a0934bd8d37a887d0d67de6ac0520f907a66ff7c3bc79176fff99171a878
45+
archive: SAPHOSTAGENT54_54-80004822.SAR
46+
checksum: 5899a0934bd8d37a887d0d67de6ac0520f907a66ff7c3bc79176fff99171a878
4647
url: https://softwaredownloads.sap.com/file/0020000001542872021
47-
path: download_basket
48+
path: download_basket
4849

4950
- name: "Installation for SAP IGS integrated in SAP Kernel"
50-
archive: igsexe_13-80003187.sar
51-
checksum: b508b1ff97ec0e3b7f4dd8f57e3840eb547b6326434df677927b8cfd6b4faa12
51+
archive: igsexe_13-80003187.sar
52+
checksum: b508b1ff97ec0e3b7f4dd8f57e3840eb547b6326434df677927b8cfd6b4faa12
5253
url: https://softwaredownloads.sap.com/file/0020000000534572021
53-
path: download_basket
54+
path: download_basket
5455

5556
- name: "SAP IGS Fonts and Textures"
56-
archive: igshelper_17-10010245.sar
57-
checksum: bc405afc4f8221aa1a10a8bc448f8afd9e4e00111100c5544097240c57c99732
57+
archive: igshelper_17-10010245.sar
58+
checksum: bc405afc4f8221aa1a10a8bc448f8afd9e4e00111100c5544097240c57c99732
5859
url: https://softwaredownloads.sap.com/file/0020000000703122018
59-
path: download_basket
60+
path: download_basket
6061

6162
- name: "SAP HANA CLIENT 2.0 for NW AS ABAP 7.52"
62-
archive: 51051805.ZIP
63-
checksum: 8dadbb7923ed7b36eaa5c1d103a2bbd216351c233de3c2d627b9e7db5755510e
63+
archive: 51051805.ZIP
64+
checksum: 8dadbb7923ed7b36eaa5c1d103a2bbd216351c233de3c2d627b9e7db5755510e
6465
url: https://softwaredownloads.sap.com/file/0030000019669572017
65-
path: download_basket
66+
path: download_basket
6667

6768
# DB Export
6869
- name: "NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 1/2"

0 commit comments

Comments
 (0)