Skip to content

Commit 6f9dfd2

Browse files
marcelmamulamarcelmamula
authored
Merge pull request sap-linuxlab#1194 from marcelmamula/2.20-ha
sap_ha_pacemaker_cluster: Ansible 2.24 compatibility
2 parents 7135ac7 + 371bc9f commit 6f9dfd2

27 files changed

Lines changed: 160 additions & 160 deletions

‎playbooks/sample-sap-storage-setup_sap_s4hana_distributed.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@
153153
ansible.builtin.include_role:
154154
name: community.sap_install.sap_storage_setup
155155
vars:
156-
sap_storage_setup_sid: "{{ aws_host_specifications_dictionary[ansible_hostname].sap_storage_setup_sid | default('') }}"
157-
sap_storage_setup_host_type: "{{ aws_host_specifications_dictionary[ansible_hostname].sap_storage_setup_host_type | list }}"
158-
sap_storage_setup_definition: "{{ aws_host_specifications_dictionary[ansible_hostname].sap_storage_setup_definition | list }}"
159-
sap_storage_setup_nwas_abap_ascs_instance_nr: "{{ aws_host_specifications_dictionary[ansible_hostname].sap_storage_setup_nwas_abap_ascs_instance_nr | default(omit) }}"
160-
sap_storage_setup_nwas_abap_ers_instance_nr: "{{ aws_host_specifications_dictionary[ansible_hostname].sap_storage_setup_nwas_abap_ers_instance_nr | default(omit) }}"
161-
sap_storage_setup_nwas_abap_pas_instance_nr: "{{ aws_host_specifications_dictionary[ansible_hostname].sap_storage_setup_nwas_abap_pas_instance_nr | default(omit) }}"
162-
sap_storage_setup_nwas_abap_aas_instance_nr: "{{ aws_host_specifications_dictionary[ansible_hostname].sap_storage_setup_nwas_abap_aas_instance_nr | default(omit) }}"
156+
sap_storage_setup_sid: "{{ aws_host_specifications_dictionary[ansible_facts['hostname']].sap_storage_setup_sid | default('') }}"
157+
sap_storage_setup_host_type: "{{ aws_host_specifications_dictionary[ansible_facts['hostname']].sap_storage_setup_host_type | list }}"
158+
sap_storage_setup_definition: "{{ aws_host_specifications_dictionary[ansible_facts['hostname']].sap_storage_setup_definition | list }}"
159+
sap_storage_setup_nwas_abap_ascs_instance_nr: "{{ aws_host_specifications_dictionary[ansible_facts['hostname']].sap_storage_setup_nwas_abap_ascs_instance_nr | default(omit) }}"
160+
sap_storage_setup_nwas_abap_ers_instance_nr: "{{ aws_host_specifications_dictionary[ansible_facts['hostname']].sap_storage_setup_nwas_abap_ers_instance_nr | default(omit) }}"
161+
sap_storage_setup_nwas_abap_pas_instance_nr: "{{ aws_host_specifications_dictionary[ansible_facts['hostname']].sap_storage_setup_nwas_abap_pas_instance_nr | default(omit) }}"
162+
sap_storage_setup_nwas_abap_aas_instance_nr: "{{ aws_host_specifications_dictionary[ansible_facts['hostname']].sap_storage_setup_nwas_abap_aas_instance_nr | default(omit) }}"

‎playbooks/sap_hana_preconfigure_exec.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# The minimum viable set of variables which need to be defined are:
77
#
88
# sap_hana_group: name of group in inventory - defaults to localhost if not set
9-
# sap_domain: SAP domain - defaults to ansible_domain if not set, but must not be empty
9+
# sap_domain: SAP domain - defaults to ansible_facts['domain'] if not set, but must not be empty
1010
#
1111
# For sap_general_preconfigure:
1212
# sap_general_preconfigure_modify_etc_hosts: defaults to true
@@ -30,9 +30,9 @@
3030
ansible.builtin.debug:
3131
msg: |-
3232
The SAP HANA preconfiguration runs with the following configuration:
33-
- 'Hostname : {{ sap_hostname | d(ansible_hostname) }}'
34-
- 'IP Address : {{ sap_ip | d(ansible_default_ipv4.address) }}'
35-
- 'Domain : {{ (sap_domain | d('') | length > 0) | ternary(sap_domain, ansible_domain) }}'
33+
- 'Hostname : {{ sap_hostname | d(ansible_facts['hostname']) }}'
34+
- 'IP Address : {{ sap_ip | d(ansible_facts['default_ipv4'].address) }}'
35+
- 'Domain : {{ (sap_domain | d('') | length > 0) | ternary(sap_domain, ansible_facts['domain']) }}'
3636
- 'Modify hosts : {{ sap_general_preconfigure_modify_etc_hosts | d('false') }}'
3737
- 'Update OS : {{ sap_hana_preconfigure_update | d('false') }}'
3838
- 'Auto Reboot : {{ sap_hana_preconfigure_reboot_ok | d('false') }}'

‎playbooks/vars/sample-variables-sap-swpm-advanced-mode-s4hana-onehost-install.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sap_swpm_inifile_custom_values_dictionary:
2727
DiagnosticsAgent.dasidAdmPassword: ''
2828
HDB_Recovery_Dialogs.backupLocation: ''
2929
HDB_Recovery_Dialogs.backupName: ''
30-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:50013/SAPControl?wsdl"
30+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:50013/SAPControl?wsdl"
3131
HDB_Recovery_Dialogs.sidAdmName: hdbadm
3232
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
3333
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -41,7 +41,7 @@ sap_swpm_inifile_custom_values_dictionary:
4141
NW_ABAP_TMSConfig.configureTMS: true
4242
NW_checkMsgServer.abapMSPort: 3602
4343
NW_CI_Instance.ascsInstanceNumber: '02'
44-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
44+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
4545
NW_CI_Instance.ciInstanceNumber: '01'
4646
NW_CI_Instance.ciMSPort: 3602
4747
NW_CI_Instance.scsInstanceNumber: ''
@@ -53,7 +53,7 @@ sap_swpm_inifile_custom_values_dictionary:
5353
NW_GetSidNoProfiles.sid: S4H
5454
NW_HDB_DB.abapSchemaName: SAPHANADB
5555
NW_HDB_DB.abapSchemaPassword: NewPass$321
56-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
56+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
5757
NW_HDB_getDBInfo.dbsid: HDB
5858
NW_HDB_getDBInfo.instanceNumber: '00'
5959
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -66,7 +66,7 @@ sap_swpm_inifile_custom_values_dictionary:
6666
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
6767
NW_SCS_Instance.ascsInstallGateway: true
6868
NW_SCS_Instance.instanceNumber: '02'
69-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
69+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
7070
nwUsers.sapsysGID: ''
7171
nwUsers.sidAdmUID: ''
7272
nwUsers.sidadmPassword: NewPass$321

‎playbooks/vars/sample-variables-sap-swpm-advanced-templates-mode.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ sap_swpm_templates_install_dictionary:
5151
DiagnosticsAgent.dasidAdmPassword: ''
5252
HDB_Recovery_Dialogs.backupLocation: ''
5353
HDB_Recovery_Dialogs.backupName: ''
54-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:50013/SAPControl?wsdl"
54+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:50013/SAPControl?wsdl"
5555
HDB_Recovery_Dialogs.sidAdmName: hdbadm
5656
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
5757
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -65,7 +65,7 @@ sap_swpm_templates_install_dictionary:
6565
NW_ABAP_TMSConfig.configureTMS: true
6666
NW_checkMsgServer.abapMSPort: 3602
6767
NW_CI_Instance.ascsInstanceNumber: '02'
68-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
68+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
6969
NW_CI_Instance.ciInstanceNumber: '01'
7070
NW_CI_Instance.ciMSPort: 3602
7171
NW_CI_Instance.scsInstanceNumber: ''
@@ -77,7 +77,7 @@ sap_swpm_templates_install_dictionary:
7777
NW_GetSidNoProfiles.sid: ''
7878
NW_HDB_DB.abapSchemaName: SAPHANADB
7979
NW_HDB_DB.abapSchemaPassword: NewPass$321
80-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
80+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
8181
NW_HDB_getDBInfo.dbsid: HDB
8282
NW_HDB_getDBInfo.instanceNumber: '00'
8383
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -90,7 +90,7 @@ sap_swpm_templates_install_dictionary:
9090
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
9191
NW_SCS_Instance.ascsInstallGateway: true
9292
NW_SCS_Instance.instanceNumber: '02'
93-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
93+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
9494
nwUsers.sapsysGID: ''
9595
nwUsers.sidAdmUID: ''
9696
nwUsers.sidadmPassword: NewPass$321
@@ -104,7 +104,7 @@ sap_swpm_templates_install_dictionary:
104104
DiagnosticsAgent.dasidAdmPassword: ''
105105
HDB_Recovery_Dialogs.backupLocation: /software/backup_location
106106
HDB_Recovery_Dialogs.backupName: COMPLETE_DATA_BACKUP
107-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:50013/SAPControl?wsdl"
107+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:50013/SAPControl?wsdl"
108108
HDB_Recovery_Dialogs.sidAdmName: hdbadm
109109
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
110110
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -121,7 +121,7 @@ sap_swpm_templates_install_dictionary:
121121
NW_ABAP_TMSConfig.transportPassword: ''
122122
NW_checkMsgServer.abapMSPort: 3602
123123
NW_CI_Instance.ascsInstanceNumber: '02'
124-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
124+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
125125
NW_CI_Instance.ciInstanceNumber: '01'
126126
NW_CI_Instance.ciMSPort: 3602
127127
NW_CI_Instance.ciVirtualHostname: ''
@@ -136,7 +136,7 @@ sap_swpm_templates_install_dictionary:
136136
NW_HDB_DB.abapSchemaPassword: NewPass$321
137137
NW_HDB_DB.javaSchemaName: ''
138138
NW_HDB_DB.javaSchemaPassword: ''
139-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
139+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
140140
NW_HDB_getDBInfo.dbsid: HDB
141141
NW_HDB_getDBInfo.instanceNumber: '00'
142142
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -152,7 +152,7 @@ sap_swpm_templates_install_dictionary:
152152
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
153153
NW_SCS_Instance.ascsInstallGateway: true
154154
NW_SCS_Instance.instanceNumber: '02'
155-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
155+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
156156
nwUsers.sapadmUID: ''
157157
nwUsers.sapsysGID: ''
158158
nwUsers.sidadmPassword: ''
@@ -167,7 +167,7 @@ sap_swpm_templates_install_dictionary:
167167
DiagnosticsAgent.dasidAdmPassword: ''
168168
HDB_Recovery_Dialogs.backupLocation: ''
169169
HDB_Recovery_Dialogs.backupName: ''
170-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:50013/SAPControl?wsdl"
170+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:50013/SAPControl?wsdl"
171171
HDB_Recovery_Dialogs.sidAdmName: hdbadm
172172
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
173173
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -181,7 +181,7 @@ sap_swpm_templates_install_dictionary:
181181
NW_ABAP_TMSConfig.configureTMS: true
182182
NW_checkMsgServer.abapMSPort: 3602
183183
NW_CI_Instance.ascsInstanceNumber: '02'
184-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
184+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
185185
NW_CI_Instance.ciInstanceNumber: '01'
186186
NW_CI_Instance.ciMSPort: 3602
187187
NW_CI_Instance.scsInstanceNumber: ''
@@ -193,7 +193,7 @@ sap_swpm_templates_install_dictionary:
193193
NW_GetSidNoProfiles.sid: ''
194194
NW_HDB_DB.abapSchemaName: SAPHANADB
195195
NW_HDB_DB.abapSchemaPassword: NewPass$321
196-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
196+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
197197
NW_HDB_getDBInfo.dbsid: HDB
198198
NW_HDB_getDBInfo.instanceNumber: '00'
199199
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -206,7 +206,7 @@ sap_swpm_templates_install_dictionary:
206206
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
207207
NW_SCS_Instance.ascsInstallGateway: true
208208
NW_SCS_Instance.instanceNumber: '02'
209-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
209+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
210210
nwUsers.sapsysGID: ''
211211
nwUsers.sidAdmUID: ''
212212
nwUsers.sidadmPassword: NewPass$321
@@ -220,7 +220,7 @@ sap_swpm_templates_install_dictionary:
220220
DiagnosticsAgent.dasidAdmPassword: ''
221221
HDB_Recovery_Dialogs.backupLocation: /software/backup_location
222222
HDB_Recovery_Dialogs.backupName: COMPLETE_DATA_BACKUP
223-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:50013/SAPControl?wsdl"
223+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:50013/SAPControl?wsdl"
224224
HDB_Recovery_Dialogs.sidAdmName: hdbadm
225225
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
226226
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -237,7 +237,7 @@ sap_swpm_templates_install_dictionary:
237237
NW_ABAP_TMSConfig.transportPassword: ''
238238
NW_checkMsgServer.abapMSPort: 3602
239239
NW_CI_Instance.ascsInstanceNumber: '02'
240-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
240+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
241241
NW_CI_Instance.ciInstanceNumber: '01'
242242
NW_CI_Instance.ciMSPort: 3602
243243
NW_CI_Instance.ciVirtualHostname: ''
@@ -252,7 +252,7 @@ sap_swpm_templates_install_dictionary:
252252
NW_HDB_DB.abapSchemaPassword: NewPass$321
253253
NW_HDB_DB.javaSchemaName: ''
254254
NW_HDB_DB.javaSchemaPassword: ''
255-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
255+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
256256
NW_HDB_getDBInfo.dbsid: HDB
257257
NW_HDB_getDBInfo.instanceNumber: '00'
258258
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -268,7 +268,7 @@ sap_swpm_templates_install_dictionary:
268268
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
269269
NW_SCS_Instance.ascsInstallGateway: true
270270
NW_SCS_Instance.instanceNumber: '02'
271-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
271+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
272272
nwUsers.sapadmUID: ''
273273
nwUsers.sapsysGID: ''
274274
nwUsers.sidadmPassword: ''
@@ -283,7 +283,7 @@ sap_swpm_templates_install_dictionary:
283283
DiagnosticsAgent.dasidAdmPassword: ''
284284
HDB_Recovery_Dialogs.backupLocation: ''
285285
HDB_Recovery_Dialogs.backupName: ''
286-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:50013/SAPControl?wsdl"
286+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:50013/SAPControl?wsdl"
287287
HDB_Recovery_Dialogs.sidAdmName: hdbadm
288288
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
289289
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -300,7 +300,7 @@ sap_swpm_templates_install_dictionary:
300300
NW_ABAP_TMSConfig.transportPassword: ''
301301
NW_checkMsgServer.abapMSPort: 3602
302302
NW_CI_Instance.ascsInstanceNumber: '02'
303-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
303+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
304304
NW_CI_Instance.ciInstanceNumber: '01'
305305
NW_CI_Instance.ciMSPort: 3602
306306
NW_CI_Instance.ciVirtualHostname: ''
@@ -315,7 +315,7 @@ sap_swpm_templates_install_dictionary:
315315
NW_HDB_DB.abapSchemaPassword: NewPass$321
316316
NW_HDB_DB.javaSchemaName: ''
317317
NW_HDB_DB.javaSchemaPassword: ''
318-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
318+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
319319
NW_HDB_getDBInfo.dbsid: HDB
320320
NW_HDB_getDBInfo.instanceNumber: '00'
321321
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -331,7 +331,7 @@ sap_swpm_templates_install_dictionary:
331331
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
332332
NW_SCS_Instance.ascsInstallGateway: true
333333
NW_SCS_Instance.instanceNumber: '02'
334-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
334+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
335335
nwUsers.sapadmUID: ''
336336
nwUsers.sapsysGID: ''
337337
nwUsers.sidadmPassword: ''
@@ -408,7 +408,7 @@ sap_swpm_templates_install_dictionary:
408408
DiagnosticsAgent.dasidAdmPassword: ''
409409
HDB_Recovery_Dialogs.backupLocation: ''
410410
HDB_Recovery_Dialogs.backupName: ''
411-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:50013/SAPControl?wsdl"
411+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:50013/SAPControl?wsdl"
412412
HDB_Recovery_Dialogs.sidAdmName: hsaadm
413413
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
414414
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -425,7 +425,7 @@ sap_swpm_templates_install_dictionary:
425425
NW_ABAP_TMSConfig.transportPassword: ''
426426
NW_checkMsgServer.abapMSPort: 3602
427427
NW_CI_Instance.ascsInstanceNumber: '02'
428-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
428+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
429429
NW_CI_Instance.ciInstanceNumber: '01'
430430
NW_CI_Instance.ciMSPort: 3602
431431
NW_CI_Instance.ciVirtualHostname: ''
@@ -440,7 +440,7 @@ sap_swpm_templates_install_dictionary:
440440
NW_HDB_DB.abapSchemaPassword: NewPass$321
441441
NW_HDB_DB.javaSchemaName: ''
442442
NW_HDB_DB.javaSchemaPassword: ''
443-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
443+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
444444
NW_HDB_getDBInfo.dbsid: HSA
445445
NW_HDB_getDBInfo.instanceNumber: '00'
446446
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -456,7 +456,7 @@ sap_swpm_templates_install_dictionary:
456456
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
457457
NW_SCS_Instance.ascsInstallGateway: true
458458
NW_SCS_Instance.instanceNumber: '02'
459-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
459+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
460460
nwUsers.sapadmUID: ''
461461
nwUsers.sapsysGID: ''
462462
nwUsers.sidadmPassword: ''
@@ -471,7 +471,7 @@ sap_swpm_templates_install_dictionary:
471471
DiagnosticsAgent.dasidAdmPassword: ''
472472
HDB_Recovery_Dialogs.backupLocation: ''
473473
HDB_Recovery_Dialogs.backupName: ''
474-
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_hostname }}:51013/SAPControl?wsdl"
474+
HDB_Recovery_Dialogs.sapControlWsdlUrl: "http://{{ ansible_facts['hostname'] }}:51013/SAPControl?wsdl"
475475
HDB_Recovery_Dialogs.sidAdmName: hsjadm
476476
HDB_Recovery_Dialogs.sidAdmPassword: NewPass$321
477477
HDB_Schema_Check_Dialogs.schemaName: ''
@@ -488,12 +488,12 @@ sap_swpm_templates_install_dictionary:
488488
NW_ABAP_TMSConfig.transportPassword: ''
489489
NW_checkMsgServer.abapMSPort: 36
490490
NW_CI_Instance.ascsInstanceNumber: ''
491-
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_hostname }}"
491+
NW_CI_Instance.ascsVirtualHostname: "{{ ansible_facts['hostname'] }}"
492492
NW_CI_Instance.ciInstanceNumber: '11'
493493
NW_CI_Instance.ciMSPort: 36
494-
NW_CI_Instance.ciVirtualHostname: "{{ ansible_hostname }}"
494+
NW_CI_Instance.ciVirtualHostname: "{{ ansible_facts['hostname'] }}"
495495
NW_CI_Instance.scsInstanceNumber: '12'
496-
NW_CI_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
496+
NW_CI_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
497497
NW_DDIC_Password.ddic000Password: NewPass$321
498498
NW_getFQDN.FQDN: poc.cloud
499499
NW_getFQDN.setFQDN: true
@@ -503,7 +503,7 @@ sap_swpm_templates_install_dictionary:
503503
NW_HDB_DB.abapSchemaPassword: ''
504504
NW_HDB_DB.javaSchemaName: SAPJAVA1
505505
NW_HDB_DB.javaSchemaPassword: NewPass$321
506-
NW_HDB_getDBInfo.dbhost: "{{ ansible_hostname }}"
506+
NW_HDB_getDBInfo.dbhost: "{{ ansible_facts['hostname'] }}"
507507
NW_HDB_getDBInfo.dbsid: HSJ
508508
NW_HDB_getDBInfo.instanceNumber: '10'
509509
NW_HDB_getDBInfo.systemDbPassword: NewPass$321
@@ -519,7 +519,7 @@ sap_swpm_templates_install_dictionary:
519519
NW_Recovery_Install_HDB.sidAdmPassword: NewPass$321
520520
NW_SCS_Instance.ascsInstallGateway: true
521521
NW_SCS_Instance.instanceNumber: ''
522-
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_hostname }}"
522+
NW_SCS_Instance.scsVirtualHostname: "{{ ansible_facts['hostname'] }}"
523523
nwUsers.sapadmUID: ''
524524
nwUsers.sapsysGID: ''
525525
nwUsers.sidadmPassword: ''

‎playbooks/vars/sample-variables-sap-swpm-default-mode-bw4hana-onehost-install.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ sap_swpm_ddic_000_password: "NewPass$321"
4141
sap_swpm_sid: B4H
4242
sap_swpm_pas_instance_nr: "01"
4343
sap_swpm_ascs_instance_nr: "02"
44-
sap_swpm_ascs_instance_hostname: "{{ ansible_hostname }}"
45-
sap_swpm_db_host: "{{ ansible_hostname }}"
44+
sap_swpm_ascs_instance_hostname: "{{ ansible_facts['hostname'] }}"
45+
sap_swpm_db_host: "{{ ansible_facts['hostname'] }}"
4646
sap_swpm_db_sid: HDB
4747
sap_swpm_db_instance_nr: "00"
4848
sap_swpm_fqdn: "poc.cloud"

0 commit comments

Comments
 (0)