Skip to content

Commit caca890

Browse files
hdamecharlahdamecharla
authored
Prepare for v3.14.1.0 (#731)
This pull request includes several changes across multiple files to improve the functionality and configuration of the deployment scripts. The key changes include updates to Ansible playbooks and templates for SAP and Oracle installations, as well as minor adjustments to YAML configuration files. ## Summary of Changes - Ensure Terraform commands in shell scripts return the correct exit code - An option has been added to each Terraform module to allow enabling Encryption at Host via `encryption_at_host_enabled` variable. - Corrected directory ownership assignment for /hana/* directories from non-existent {{ sidadm }} to the proper {{ hdbadm }} user ID - Preserved ARM_SUBSCRIPTION_ID throughout authentication processes when using Managed Service Identity (MSI) - Fixed remediation logic for storage accounts to support provider upgrades with data_plane_available setting - Refactored ReplaceResourceInStateFile function to accept direct input rather than relying on external context - Enhanced robustness for workload zones by improving resource property handling for zones not recently redeployed - Resolved infrastructure deployment failures in SYBASE standalone deployments when enable_app_tier_deployment is set to false - Fixed circular mount issues of /sapmnt in standalone deployments using NFS_provider = NONE with supported_tiers for SCS and SYBASE ## Acknowledgements @pkrcm, @SteffenBoThomsen
1 parent e246d84 commit caca890

139 files changed

Lines changed: 2815 additions & 1219 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.

‎Webapp/SDAF/Controllers/Helper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ public static string TfvarToJson(string hclString)
410410
value += "{";
411411
value += "\"Key\":" + tagKey + "," + "\"Value\":" + tagValue.Trim(',');
412412
value += "},";
413-
currLine = stringReader.ReadLine();
413+
currLine = stringReader.ReadLine().TrimStart();
414414
}
415415
value = value.Trim(',');
416416
value += "],";

‎boilerplate/02-sap-workload-zone.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ parameters:
5353
- NOEU
5454
- NOEA
5555
- NOWE
56+
- NZNO
5657
- SANO
5758
- SAWE
5859
- SCUS

‎deploy/ansible/playbook_05_00_00_sap_scs_install.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@
119119
ansible.builtin.set_fact:
120120
this_sid:
121121
{
122-
'sid': '{{ sap_sid | upper }}',
123-
'dbsid_uid': '{{ hdbadm_uid }}',
124-
'sidadm_uid': '{% if platform == "SYBASE" %}{{ asesidadm_uid }}{% else %}{{ sidadm_uid }}{% endif %}',
122+
'sid': '{{ sap_sid | upper }}',
123+
'dbsid_uid': '{{ hdbadm_uid }}',
124+
'sidadm_uid': '{{ UIDs[ platform ].uid }}',
125125
'ascs_inst_no': '{{ scs_instance_number }}',
126-
'pas_inst_no': '{{ pas_instance_number }}',
127-
'app_inst_no': '{{ app_instance_number }}'
126+
'pas_inst_no': '{{ pas_instance_number }}',
127+
'app_inst_no': '{{ app_instance_number }}'
128128
}
129129
tags:
130130
- always
@@ -215,12 +215,12 @@
215215
ansible.builtin.set_fact:
216216
this_sid:
217217
{
218-
'sid': '{{ sap_sid | upper }}',
219-
'dbsid_uid': '{{ hdbadm_uid }}',
220-
'sidadm_uid': '{% if platform == "SYBASE" %}{{ asesidadm_uid }}{% else %}{{ sidadm_uid }}{% endif %}',
218+
'sid': '{{ sap_sid | upper }}',
219+
'dbsid_uid': '{{ hdbadm_uid }}',
220+
'sidadm_uid': '{{ UIDs[ platform ].uid }}',
221221
'ascs_inst_no': '{{ scs_instance_number }}',
222-
'pas_inst_no': '{{ pas_instance_number }}',
223-
'app_inst_no': '{{ app_instance_number }}'
222+
'pas_inst_no': '{{ pas_instance_number }}',
223+
'app_inst_no': '{{ app_instance_number }}'
224224
}
225225

226226
- name: "SCS Installation Playbook: Define list of SIDs"
@@ -301,7 +301,7 @@
301301
name: roles-sap/7.0.0-post-install
302302
vars:
303303
suffix: "_SCS"
304-
prefix: "{{ bom.product_ids.scs.replace('.', '/').replace('/ABAP', '').split(':')[1] }}"
304+
prefix: "{{ bom.product_ids.scs.replace('.', '/').replace('/ABAP', '').replace('/JAVA', '').split(':')[1] }}"
305305
path: 'INSTALL/DISTRIBUTED/{{ scs_bom_instance_type }}/{{ instance_type }}'
306306
tier: 'scs'
307307
this_sid: "{{ sid_to_be_deployed.sid | upper }}"
@@ -567,7 +567,7 @@
567567
name: roles-sap/7.0.0-post-install
568568
vars:
569569
suffix: "_SCS"
570-
prefix: "{{ scs_bom_id.replace('.', '/').replace('/ABAPHA', '').replace('/HA', '').split(':')[1] }}"
570+
prefix: "{{ scs_bom_id.replace('.', '/').replace('/JAVAHA', '').replace('/ABAPHA', '').replace('/HA', '').split(':')[1] }}"
571571
path: 'INSTALL/HA/{{ scs_bom_instance_type }}/{{ instance_type }}'
572572
tier: 'scs'
573573
this_sid: "{{ sap_sid | upper }}"
@@ -581,7 +581,7 @@
581581
name: roles-sap/7.0.0-post-install
582582
vars:
583583
suffix: "_ERS"
584-
prefix: "{{ ers_bom_id.replace('.', '/').replace('/ABAPHA', '').replace('/HA', '').split(':')[1] }}"
584+
prefix: "{{ ers_bom_id.replace('.', '/').replace('/ABAPHA', '').replace('/JAVAHA', '').replace('/HA', '').split(':')[1] }}"
585585
path: 'INSTALL/HA/{{ ers_bom_instance_type }}/ERS'
586586
tier: 'ers'
587587
this_sid: "{{ sap_sid | upper }}"

‎deploy/ansible/playbook_05_02_sap_pas_install.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@
8787
ansible.builtin.set_fact:
8888
this_sid:
8989
{
90-
'sid': '{{ sap_sid | upper }}',
91-
'dbsid_uid': '{{ hdbadm_uid }}',
92-
'sidadm_uid': '{% if platform == "SYBASE" %}{{ asesidadm_uid }}{% else %}{{ sidadm_uid }}{% endif %}',
93-
'ascs_inst_no': '{{ scs_instance_number }}',
94-
'pas_inst_no': '{{ pas_instance_number }}',
95-
'app_inst_no': '{{ app_instance_number }}'
90+
'sid': '{{ sap_sid | upper }}',
91+
'dbsid_uid': '{{ hdbadm_uid }}',
92+
'sidadm_uid': '{{ UIDs[ platform ].uid }}',
93+
'ascs_inst_no': '{{ scs_instance_number }}',
94+
'pas_inst_no': '{{ pas_instance_number }}',
95+
'app_inst_no': '{{ app_instance_number }}'
9696
}
9797

9898
- name: "PAS Installation Playbook: - Set 'pas' tier facts"
@@ -163,12 +163,12 @@
163163
ansible.builtin.set_fact:
164164
this_sid:
165165
{
166-
'sid': '{{ sap_sid | upper }}',
167-
'dbsid_uid': '{{ hdbadm_uid }}',
168-
'sidadm_uid': '{% if platform == "SYBASE" %}{{ asesidadm_uid }}{% else %}{{ sidadm_uid }}{% endif %}',
169-
'ascs_inst_no': '{{ scs_instance_number }}',
170-
'pas_inst_no': '{{ pas_instance_number }}',
171-
'app_inst_no': '{{ app_instance_number }}'
166+
'sid': '{{ sap_sid | upper }}',
167+
'dbsid_uid': '{{ hdbadm_uid }}',
168+
'sidadm_uid': '{{ UIDs[ platform ].uid }}',
169+
'ascs_inst_no': '{{ scs_instance_number }}',
170+
'pas_inst_no': '{{ pas_instance_number }}',
171+
'app_inst_no': '{{ app_instance_number }}'
172172
}
173173

174174
- name: "PAS Installation Playbook: Define list of SIDs"

‎deploy/ansible/playbook_05_03_sap_app_install.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@
8787
ansible.builtin.set_fact:
8888
this_sid:
8989
{
90-
'sid': '{{ sap_sid | upper }}',
91-
'dbsid_uid': '{{ hdbadm_uid }}',
92-
'sidadm_uid': '{% if platform == "SYBASE" %}{{ asesidadm_uid }}{% else %}{{ sidadm_uid }}{% endif %}',
90+
'sid': '{{ sap_sid | upper }}',
91+
'dbsid_uid': '{{ hdbadm_uid }}',
92+
'sidadm_uid': '{{ UIDs[ platform ].uid }}',
9393
'ascs_inst_no': '{{ scs_instance_number }}',
94-
'pas_inst_no': '{{ pas_instance_number }}',
95-
'app_inst_no': '{{ app_instance_number }}'
94+
'pas_inst_no': '{{ pas_instance_number }}',
95+
'app_inst_no': '{{ app_instance_number }}'
9696
}
9797

9898
- name: "APP Installation Playbook: Define list of SIDs"
@@ -151,12 +151,12 @@
151151
ansible.builtin.set_fact:
152152
this_sid:
153153
{
154-
'sid': '{{ sap_sid | upper }}',
155-
'dbsid_uid': '{{ hdbadm_uid }}',
156-
'sidadm_uid': '{% if platform == "SYBASE" %}{{ asesidadm_uid }}{% else %}{{ sidadm_uid }}{% endif %}',
157-
'ascs_inst_no': '{{ scs_instance_number }}',
158-
'pas_inst_no': '{{ pas_instance_number }}' ,
159-
'app_inst_no': '{% if app_instance_number is defined %}{{ app_instance_number }}{% else %}00{% endif %}'
154+
'sid': '{{ sap_sid | upper }}',
155+
'dbsid_uid': '{{ hdbadm_uid }}',
156+
'sidadm_uid': '{{ UIDs[ platform ].uid }}',
157+
'ascs_inst_no': '{{ scs_instance_number }}',
158+
'pas_inst_no': '{{ pas_instance_number }}',
159+
'app_inst_no': '{{ app_instance_number }}'
160160
}
161161

162162
- name: "APP Installation Playbook: Define list of SIDs"

‎deploy/ansible/roles-db/4.0.0-hdb-install/tasks/main.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,34 @@
5151
msg: "INSTALL:0001:Unable to find hdblcm, please check that the installation media is mounted"
5252
when: not hdblcm_found.stat.exists
5353

54+
- name: "SAP HANA: check sp version from manifest"
55+
ansible.builtin.shell: |
56+
set -o pipefail
57+
grep sp-number manifest | cut -d ":" -f 2 | tr -d [:space:]
58+
args:
59+
chdir: "{{ target_media_location }}/CD_HDBSERVER/SAP_HANA_DATABASE/server"
60+
register: manifest_hana_sp
61+
62+
- name: "SAP HANA: Show sps leve"
63+
ansible.builtin.debug:
64+
msg: "HANA SP Level: {{ manifest_hana_sp.stdout }}"
65+
66+
- name: "SAP HANA: Set fact when sps is 08 or higher"
67+
ansible.builtin.set_fact:
68+
hana_sp08_or_higher: "{{ manifest_hana_sp.stdout is version('080', '>=') }}"
69+
70+
# all | client | es | ets | lcapps | server | smartda | streaming | rdsync | xs | studio | afl | sca | sop | eml | rme | rtl | trp
71+
- name: "SAP HANA: Set HANA components"
72+
ansible.builtin.set_fact:
73+
hana_components: "server, lcapps, afl, vch2021"
74+
when:
75+
- hana_sp08_or_higher
76+
- hana_components == 'all'
77+
78+
- name: "SAP HANA: Show HANA components"
79+
ansible.builtin.debug:
80+
msg: "HANA Components: {{ hana_components }}"
81+
5482
- name: "HANA Install"
5583
block:
5684

‎deploy/ansible/roles-db/4.0.0-hdb-install/templates/HANA_2_00_install.rsp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,13 @@ xs_trust_pem=
257257
lss_inst_path=/lss/shared
258258

259259
# Local Secure Store User Password
260-
lss_user_password=
260+
lss_user_password={{ pwd_os_sidadm }}
261261

262262
# Local Secure Store User ID
263-
lss_userid=
263+
lss_userid={{ lss_uid }}
264264

265265
# Local Secure Store User Group ID
266-
lss_groupid=
266+
lss_groupid={{ lss_gid }}
267267

268268
# Local Secure Store User Home Directory ( Default: /usr/sap/${sid}/lss/home )
269269
lss_user_home=/usr/sap/${sid}/lss/home
@@ -272,7 +272,7 @@ lss_user_home=/usr/sap/${sid}/lss/home
272272
lss_user_shell=/bin/sh
273273

274274
# Local Secure Store Auto Backup Password
275-
lss_backup_password=
275+
lss_backup_password={{ pwd_os_sidadm }}
276276

277277
[streaming]
278278

‎deploy/ansible/roles-db/4.0.3-hdb-install-scaleout/templates/HANA_2_00_install_scaleout.rsp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ verify_signature=n
2525
components={{ _rsp_components }}
2626

2727
# Install Execution Mode ( Default: standard; Valid values: standard | optimized )
28-
install_execution_mode=standard
28+
install_execution_mode=optimized
2929

3030
# Ignore failing prerequisite checks
3131
ignore=
@@ -251,19 +251,20 @@ xs_cert_key=
251251
# XS Advanced Trust Certificate
252252
xs_trust_pem=
253253

254+
254255
[lss]
255256

256257
# Installation Path for Local Secure Store ( Default: /lss/shared )
257258
lss_inst_path=/lss/shared
258259

259260
# Local Secure Store User Password
260-
lss_user_password=
261+
lss_user_password={{ pwd_os_sidadm }}
261262

262263
# Local Secure Store User ID
263-
lss_userid=
264+
lss_userid={{ lss_uid }}
264265

265266
# Local Secure Store User Group ID
266-
lss_groupid=
267+
lss_groupid={{ lss_gid }}
267268

268269
# Local Secure Store User Home Directory ( Default: /usr/sap/${sid}/lss/home )
269270
lss_user_home=/usr/sap/${sid}/lss/home
@@ -272,7 +273,7 @@ lss_user_home=/usr/sap/${sid}/lss/home
272273
lss_user_shell=/bin/sh
273274

274275
# Local Secure Store Auto Backup Password
275-
lss_backup_password=
276+
lss_backup_password={{ pwd_os_sidadm }}
276277

277278
[streaming]
278279

‎deploy/ansible/roles-db/4.0.4-hdb-schema/tasks/main.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,32 @@
88
# | |
99
# +------------------------------------4--------------------------------------*/
1010

11-
- name: "HDB Schema: Get DEFAULT.PFL"
11+
- name: "HDB Schema: Get DEFAULT.PFL"
1212
ansible.builtin.slurp:
13-
src: "/sapmnt/{{ sap_sid | upper }}/profile/DEFAULT.PFL"
14-
register: profilefile
13+
src: "/sapmnt/{{ sap_sid | upper }}/profile/DEFAULT.PFL"
14+
register: profilefile
1515

16-
- name: "HDB Schema: Get schema property"
16+
- name: "HDB Schema: Get schema property"
1717
ansible.builtin.set_fact:
18-
schema_property: "{{ profilefile['content'] | b64decode | split('\n') | select('search', property_name ) }}"
19-
loop: "{{ hdb_schema_property_names }}"
18+
schema_property: "{{ profilefile['content'] | b64decode | split('\n') | select('search', property_name ) }}"
19+
loop: "{{ hdb_schema_property_names }}"
2020
loop_control:
21-
loop_var: property_name
21+
loop_var: property_name
2222
when:
2323
- (schema_property | default([])) | length <= 0
2424

25-
- name: "HDB Schema: Parse schema name"
25+
- name: "HDB Schema: Parse schema name"
2626
ansible.builtin.set_fact:
27-
schema_name: "{{ schema_property | first | split('=') | last | trim }}"
27+
schema_name: "{{ schema_property | first | split('=') | last | trim }}"
2828
when:
2929
- (schema_property | default([])) | length > 0
3030

31-
- name: "HDB Schema: Set default schema"
31+
- name: "HDB Schema: Set default schema"
3232
ansible.builtin.set_fact:
33-
schema_name: "{{ hana_schema }}"
33+
schema_name: "{{ hana_schema }}"
3434
when:
3535
- schema_name is not defined
3636

37-
- name: "HDB Schema: Show schema name"
37+
- name: "HDB Schema: Show schema name"
3838
ansible.builtin.debug:
39-
msg: "Schema name: {{ schema_name }}"
39+
msg: "Schema name: {{ schema_name }}"

0 commit comments

Comments
 (0)