Skip to content

Commit

Permalink
v 3.4.1 release (#201)
Browse files Browse the repository at this point in the history
* 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) <[email protected]>

* 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 b8fb0df.

* 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) <[email protected]>

* 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 <[email protected]>
Co-authored-by: hdamecharla <[email protected]>
Co-authored-by: Erick Segaar <[email protected]>

Co-authored-by: Erick Segaar <[email protected]>
Co-authored-by: Rickmarges <[email protected]>
Co-authored-by: Marges, RSY (Rick) <[email protected]>
Co-authored-by: Kimmo Forss <[email protected]>
Co-authored-by: hdamecharla <[email protected]>
Co-authored-by: Harm Jan Stam <[email protected]>
  • Loading branch information
7 people authored Jun 20, 2022
1 parent 1e37630 commit d242003
Show file tree
Hide file tree
Showing 236 changed files with 1,912 additions and 2,619 deletions.
20 changes: 10 additions & 10 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
exclude_paths:
- deploy/pipelines
- deploy/ansible/BOM-catalog
- deploy/terraform
- .github
# added ansible_skip_lint tag to exclude the task rather than the whole file.
# - 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

warn_list:
# FIXME: Experimental violations should be fixed in separate PR
- experimental

skip_list:
# Ignored because there is no easier way to do
- empty-string-compare
- no-handler

# Following are ignored because of readability:
- line-length
- comments
- comments-indentation
- colons
- commas
- braces
- hyphens
- no-changed-when
- role-name
- var-naming
- no-changed-when
- yaml[braces]
- yaml[colons]
- yaml[commas]
- yaml[line-length]

#csh is not supported in command
# csh is not supported in command
- command-instead-of-shell
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*.sh text eol=lf
*.tfvars text eol=lf
*.tf text eol=lf
*.tmpl text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
*.jpg -text
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ nwUsers.sidAdmUID = {{ sidadm

NW_Delete_Sapinst_Users.removeUsers = true
NW_GetMasterPassword.masterPwd = {{ main_password }}
NW_GetSidNoProfiles.sid = {{ sap_sid|upper }}
NW_GetSidNoProfiles.sid = {{ sap_sid| upper }}

NW_SCS_Instance.ascsInstallGateway = true
NW_SCS_Instance.ascsInstallWebDispatcher = false
Expand All @@ -50,14 +50,14 @@ NW_HDB_DB.abapSchemaName = SAPHANAD
NW_HDB_DB.abapSchemaPassword = {{ main_password }}
NW_HDB_DBClient.clientPathStrategy = SAPCPE
NW_HDB_getDBInfo.dbhost = {{ sap_db_hostname }}
NW_HDB_getDBInfo.dbsid = {{ db_sid|upper }}
NW_HDB_getDBInfo.dbsid = {{ db_sid| upper }}
NW_HDB_getDBInfo.instanceNumber = {{ hdb_instance_number }}
NW_HDB_getDBInfo.systemDbPassword = {{ main_password }}
NW_HDB_getDBInfo.systemPassword = {{ main_password }}
NW_HDB_getDBInfo.systemid = {{ db_sid|upper }}
NW_HDB_getDBInfo.systemid = {{ db_sid| upper }}
NW_HDB_getDBInfo.usingSSL = true

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

NW_Recovery_Install_HDB.extractParallelJobs = 24
NW_Recovery_Install_HDB.sidAdmName = {{ db_sid|lower }}adm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ nwUsers.sidAdmUID = {{ sidadm

NW_Delete_Sapinst_Users.removeUsers = true
NW_GetMasterPassword.masterPwd = {{ main_password }}
NW_GetSidNoProfiles.sid = {{ sap_sid|upper }}
NW_GetSidNoProfiles.sid = {{ sap_sid| upper }}

NW_SCS_Instance.ascsInstallGateway = true
NW_SCS_Instance.ascsInstallWebDispatcher = false
Expand All @@ -45,14 +45,14 @@ NW_HDB_DB.abapSchemaName = SAPHANAD
NW_HDB_DB.abapSchemaPassword = {{ main_password }}
NW_HDB_DBClient.clientPathStrategy = SAPCPE
NW_HDB_getDBInfo.dbhost = {{ sap_db_hostname }}
NW_HDB_getDBInfo.dbsid = {{ db_sid|upper }}
NW_HDB_getDBInfo.dbsid = {{ db_sid| upper }}
NW_HDB_getDBInfo.instanceNumber = {{ hdb_instance_number }}
NW_HDB_getDBInfo.systemDbPassword = {{ main_password }}
NW_HDB_getDBInfo.systemPassword = {{ main_password }}
NW_HDB_getDBInfo.systemid = {{ db_sid|upper }}
NW_HDB_getDBInfo.systemid = {{ db_sid| upper }}
NW_HDB_getDBInfo.usingSSL = true

NW_Recovery_Install_HDB.extractLocation = /usr/sap/{{ db_sid|upper }}/{{ db_sid|upper }}{{ hdb_instance_number }}/backup/data/DB_HDB
NW_Recovery_Install_HDB.extractLocation = /usr/sap/{{ db_sid| upper }}/{{ db_sid| upper }}{{ hdb_instance_number }}/backup/data/DB_HDB
NW_Recovery_Install_HDB.extractParallelJobs = 24
NW_Recovery_Install_HDB.sidAdmName = {{ db_sid|lower }}adm
NW_Recovery_Install_HDB.sidAdmPassword = {{ main_password }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ NW_GetMasterPassword.masterPwd = {{ main_
NW_adaptProfile.skipSecurityProfileSettings = true
NW_getFQDN.FQDN = {{ sap_fqdn }}

NW_GetSidNoProfiles.sid = {{ sap_sid|upper }}
NW_webdispatcher_Instance.backEndSID = {{ sap_sid|upper }}
NW_GetSidNoProfiles.sid = {{ sap_sid| upper }}
NW_webdispatcher_Instance.backEndSID = {{ sap_sid| upper }}

NW_Webdispatcher_Instance.wdInstanceNumber = {{ web_instance_number }}
NW_webdispatcher_Instance.activateICF = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ product_ids:
materials:
dependencies:
- name: HANA_2_00_059_v0002ms
- name: SWPM10SP34_latest
- name: SUM20SP13_latest
- name: SWPM10SP35_latest
- name: SUM20SP14_latest

media:
# Kernel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ NW_HDB_DB.abapSchemaName = SAPABAP1
NW_HDB_DB.abapSchemaPassword = {{ main_password }}
NW_HDB_DBClient.clientPathStrategy = SAPCPE
NW_HDB_getDBInfo.dbhost = {{ sap_db_hostname }}
NW_HDB_getDBInfo.dbsid = {{ db_sid|upper }}
NW_HDB_getDBInfo.dbsid = {{ db_sid| upper }}
NW_HDB_getDBInfo.instanceNumber = {{ hdb_instance_number }}
NW_HDB_getDBInfo.systemDbPassword = {{ main_password }}
NW_HDB_getDBInfo.systemPassword = {{ main_password }}
NW_HDB_getDBInfo.systemid = {{ db_sid|upper }}
NW_HDB_getDBInfo.systemid = {{ db_sid| upper }}
NW_HDB_getDBInfo.usingSSL = true

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

NW_checkMsgServer.abapMSPort = 36{{ scs_instance_number }}
NW_getLoadType.loadType = SAP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
########################################################################################################################################################################################################


NW_Users_Create.dbsid = {{ sap_sid|upper }}
NW_Users_Create.dbsid = {{ sap_sid| upper }}

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

# SAP system ID
NW_Users_Create.sid = {{ sap_sid|upper }}
NW_Users_Create.sid = {{ sap_sid| upper }}

nwUsers.sapadmUID = {{ sapadm_uid }}
nwUsers.sapsysGID = {{ sapsys_gid }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

name: "NW752SPS09_v0001ms"
target: "NETWEAVER 7.52 SPS 09"
version: 1

defaults:
target_location: "{{ target_media_location }}/download_basket"
Expand All @@ -20,49 +21,49 @@ product_ids:

materials:
dependencies:
- name: HANA_2_00_059_v0002ms
- name: SWPM10SP34_latest
- name: SUM20SP13_latest
- name: HANA_2_00_061_v0001ms
- name: SWPM10SP35_latest
- name: SUM20SP14_latest

media:

# kernel components

- name: "Kernel Part II (753)"
archive: SAPEXEDB_900-80002572.SAR
checksum: 83eb0450e30e7cefb09aa3def0a3f7f0bdbf5b2ee1ccbe481443084f50f98e37
archive: SAPEXEDB_900-80002572.SAR
checksum: 83eb0450e30e7cefb09aa3def0a3f7f0bdbf5b2ee1ccbe481443084f50f98e37
url: https://softwaredownloads.sap.com/file/0020000001557752021
path: download_basket
path: download_basket

- name: "Kernel Part I (753)"
archive: SAPEXE_900-80002573.SAR
checksum: f5755f3df7be0bd0f1f07c959bc55c806a51ba3131287c568c2535bd8fdf713d
archive: SAPEXE_900-80002573.SAR
checksum: f5755f3df7be0bd0f1f07c959bc55c806a51ba3131287c568c2535bd8fdf713d
url: https://softwaredownloads.sap.com/file/0020000001557032021
path: download_basket
path: download_basket

- name: "SAP HOST AGENT 7.22 SP54"
archive: SAPHOSTAGENT54_54-80004822.SAR
checksum: 5899a0934bd8d37a887d0d67de6ac0520f907a66ff7c3bc79176fff99171a878
archive: SAPHOSTAGENT54_54-80004822.SAR
checksum: 5899a0934bd8d37a887d0d67de6ac0520f907a66ff7c3bc79176fff99171a878
url: https://softwaredownloads.sap.com/file/0020000001542872021
path: download_basket
path: download_basket

- name: "Installation for SAP IGS integrated in SAP Kernel"
archive: igsexe_13-80003187.sar
checksum: b508b1ff97ec0e3b7f4dd8f57e3840eb547b6326434df677927b8cfd6b4faa12
archive: igsexe_13-80003187.sar
checksum: b508b1ff97ec0e3b7f4dd8f57e3840eb547b6326434df677927b8cfd6b4faa12
url: https://softwaredownloads.sap.com/file/0020000000534572021
path: download_basket
path: download_basket

- name: "SAP IGS Fonts and Textures"
archive: igshelper_17-10010245.sar
checksum: bc405afc4f8221aa1a10a8bc448f8afd9e4e00111100c5544097240c57c99732
archive: igshelper_17-10010245.sar
checksum: bc405afc4f8221aa1a10a8bc448f8afd9e4e00111100c5544097240c57c99732
url: https://softwaredownloads.sap.com/file/0020000000703122018
path: download_basket
path: download_basket

- name: "SAP HANA CLIENT 2.0 for NW AS ABAP 7.52"
archive: 51051805.ZIP
checksum: 8dadbb7923ed7b36eaa5c1d103a2bbd216351c233de3c2d627b9e7db5755510e
archive: 51051805.ZIP
checksum: 8dadbb7923ed7b36eaa5c1d103a2bbd216351c233de3c2d627b9e7db5755510e
url: https://softwaredownloads.sap.com/file/0030000019669572017
path: download_basket
path: download_basket

# DB Export
- name: "NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 1/2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ NW_HDB_DB.abapSchemaName = SAPABAP1
NW_HDB_DB.abapSchemaPassword = {{ main_password }}
NW_HDB_DBClient.clientPathStrategy = SAPCPE
NW_HDB_getDBInfo.dbhost = {{ sap_db_hostname }}
NW_HDB_getDBInfo.dbsid = {{ db_sid|upper }}
NW_HDB_getDBInfo.dbsid = {{ db_sid| upper }}
NW_HDB_getDBInfo.instanceNumber = {{ hdb_instance_number }}
NW_HDB_getDBInfo.systemDbPassword = {{ main_password }}
NW_HDB_getDBInfo.systemPassword = {{ main_password }}
NW_HDB_getDBInfo.systemid = {{ db_sid|upper }}
NW_HDB_getDBInfo.systemid = {{ db_sid| upper }}
NW_HDB_getDBInfo.usingSSL = true

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

NW_checkMsgServer.abapMSPort = 36{{ scs_instance_number }}
NW_getLoadType.loadType = SAP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@ materials:
archive: SAPEXE_801-80002573.SAR
checksum: c1efbbd12cb16134720b251fd18cab4fdbc8a0a3ee93b54c2ee41671bc3048fc
extract: false
#download: true
# download: true
path: download_basket
#creates: SIGNATURE.SMF
# creates: SIGNATURE.SMF
url: https://softwaredownloads.sap.com/file/0020000000937192021

- name: "Oracle DB specific kernel files"
archive: SAPEXEDB_801-80002605.SAR
checksum: 3682acc6bbc9b5a122af422835217875e01cecd372b04649ef0659fcade3163e
extract: false
#download: true
# download: true
path: download_basket
#creates: SIGNATURE.SMF
# creates: SIGNATURE.SMF
url: https://softwaredownloads.sap.com/file/0020000000937422021

- name: "Oracle DBATOOLS"
archive: DBATL740O11_47-70001657.SAR
checksum: f0dc4198bcfab1c137c8521e934092e059248739782af24138a160b1dc309d0d
extract: false
#download: true
# download: true
path: download_basket
#creates: SIGNATURE.SMF
# creates: SIGNATURE.SMF
url: https://softwaredownloads.sap.com/file/0020000001291502021

# # SWPM
Expand All @@ -71,7 +71,7 @@ materials:
download: true
extractDir: EXPORT
path: download_basket
#creates: SIGNATURE.SMF
# creates: SIGNATURE.SMF
url: https://softwaredownloads.sap.com/file/0030000000635092016

- name: "SAP Host Agent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ NW_GetSidNoProfiles.sid = {{ sid_to
NW_getFQDN.FQDN = {{ sap_fqdn }}
hostAgent.sapAdmPassword = {{ main_password }}
nwUsers.sidadmPassword = {{ main_password }}
#NW_readProfileDir.profileDir = /sapmnt/{{ sap_sid|upper }}/profile
#NW_readProfileDir.profileDir = /sapmnt/{{ sap_sid| upper }}/profile

#Oracle Database parameters

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
########################################################################################################################################################################################################


NW_Users_Create.dbsid = {{ db_sid|upper }}
NW_Users_Create.dbsid = {{ db_sid | upper }}

# Specify whether you are preparing for an SAP sytem based on AS ABAP.
NW_Users_Create.hasABAP = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ nwUsers.sidadmPassword = {{ main_p

NW_Delete_Sapinst_Users.removeUsers = true
NW_GetMasterPassword.masterPwd = {{ main_password }}
NW_GetSidNoProfiles.sid = {{ sid_to_be_deployed.sid |upper }}
NW_GetSidNoProfiles.sid = {{ sid_to_be_deployed.sid | upper }}
NW_getUnicode.isUnicode = true
NW_SCS_Instance.ascsInstallGateway = true
NW_SCS_Instance.ascsInstallWebDispatcher = false
Expand All @@ -46,7 +46,7 @@ storageBasedCopy.ora.serverVersion = 19
storageBasedCopy.ora.ABAPSchema = SAPSR3
storageBasedCopy.ora.listenerName = LISTENER
storageBasedCopy.ora.listenerPort = 1521
#NW_readProfileDir.profileDir = /sapmnt/{{ sap_sid|upper }}/profile
#NW_readProfileDir.profileDir = /sapmnt/{{ sap_sid| upper }}/profile

NW_CI_Instance.ascsVirtualHostname = {{ sap_scs_hostname }}
NW_CI_Instance.ciInstanceNumber = {{ sid_to_be_deployed.ascs_inst_no }}
Expand Down
Loading

0 comments on commit d242003

Please sign in to comment.