Skip to content

Commit 93d02a8

Browse files
committed
Merge changes from stage to main branch (PR #66).
1 parent 77330a8 commit 93d02a8

File tree

25 files changed

+45
-49
lines changed

25 files changed

+45
-49
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ The Ansible Playbooks for SAP offer several key benefits:
3535
### Supported Deployment Scenarios
3636
| SAP Product | Versions | Deployment Topology | Database |
3737
| --- | --- | --- | --- |
38-
| SAP HANA | 2.0 SPS 07<br> 2.0 SPS 06 | Sandbox<br> Scale-Out <br> Scale-Up High Availability | SAP HANA |
38+
| SAP HANA | 2.0 SPS 08<br> 2.0 SPS 07<br> 2.0 SPS 06 | Sandbox<br> Scale-Out <br> Scale-Up High Availability | SAP HANA |
3939
| SAP BW/4HANA | 2023<br> 2021 | Sandbox<br> Scale-Out | SAP HANA |
40-
| SAP S/4HANA | 2023<br> 2022<br> 2021<br> 2020 | Sandbox*<br> Standard*<br> Distributed*<br> Distributed with High Availability* | SAP HANA |
40+
| SAP S/4HANA | 2023<br> 2022<br> 2021<br> 2020 | Sandbox<br> Standard<br> Distributed<br> Distributed with High Availability | SAP HANA |
41+
| SAP S/4HANA<br> Maintenance Plan | Any version - Defined by Maintenance Plan</br> Includes latest FPS and security patches | Sandbox<br> Standard<br> Distributed<br> Distributed with High Availability | SAP HANA |
4142
| SAP S/4HANA Foundation | 2023<br> 2022<br> 2021 | Sandbox<br> Standard | SAP HANA |
42-
| SAP Landscape for SAP S/4HANA | 2023<br> 2022<br> 2021<br> 2020 | 3-System Standard* | SAP HANA |
43+
| SAP Landscape for SAP S/4HANA | 2023<br> 2022<br> 2021<br> 2020 | 3-System Standard | SAP HANA |
44+
| SAP Landscape for SAP S/4HANA<br> Maintenance Plan | Any version - Defined by Maintenance Plan</br> Includes latest FPS and security patches | 3-System Standard | SAP HANA |
4345
| SAP Business Suite (ECC) | EHP 8<br> EHP 7 | Sandbox | SAP HANA |
4446
| SAP Business Suite (ECC) | EHP 8 | Sandbox<br> Distributed (IBM Db2) | IBM Db2<br> Oracle DB<br> SAP ASE<br> SAP MaxDB |
4547
| SAP IDES for ECC | EHP 8 | Sandbox | SAP HANA, IBM Db2 |
4648
| SAP NetWeaver ABAP | 7.52 SP00<br> 7.50 SP00 | Sandbox | SAP HANA<br> IBM Db2<br> Oracle DB<br> SAP ASE<br> SAP MaxDB |
4749
| SAP NetWeaver JAVA | 7.50 SP22 | Sandbox | IBM Db2<br> SAP ASE |
4850
| SAP Solution Manager ABAP/JAVA | 7.2 SR2 | Sandbox | SAP HANA<br> SAP ASE |
4951

50-
> <sub>Note: Scenarios marked with an asterisk (*) also support download of SAP Installation Media using Maintenance Planner transaction.</sub>
51-
5252
> <sub>Note: Additional SAP Product versions can be added by customizing extra vars file.</sub>
5353
5454
The explanation of Deployment Topologies:
@@ -78,7 +78,7 @@ The playbooks can be executed with one of following methods.
7878
### Ansible with existing host(s)
7979
This method is used to install the SAP system on an existing host(s).
8080
- **Interactive Prompts:** Yes :white_check_mark:
81-
- **Provisioning:**: No :x:
81+
- **Provisioning:** No :x:
8282
- **SAP Installation:** Yes :white_check_mark:
8383
- **Required Variables:**
8484
- `sap_vm_provision_iac_type: ansible`
@@ -91,7 +91,7 @@ This method is used to install the SAP system on an existing host(s).
9191
### Ansible provisions host(s)
9292
This method provisions a new host(s) and installs the SAP system.
9393
- **Interactive Prompts:** Yes :white_check_mark:
94-
- **Provisioning:**: Yes :white_check_mark:
94+
- **Provisioning:** Yes :white_check_mark:
9595
- **SAP Installation:** Yes :white_check_mark:
9696
- **Required Variables:**
9797
- `sap_vm_provision_iac_type: ansible`
@@ -104,7 +104,7 @@ This method provisions a new host(s) and installs the SAP system.
104104
### Ansible uses Terraform to provision minimal landing zone and host(s)
105105
This method provisions a minimal landing zone and a new host(s) using Terraform and installs the SAP system using Ansible.
106106
- **Interactive Prompts:** Yes :white_check_mark: `[Experimental]` (Limited support for Terraform variables)
107-
- **Provisioning:**: Yes :white_check_mark:
107+
- **Provisioning:** Yes :white_check_mark:
108108
- **SAP Installation:** Yes :white_check_mark:
109109
- **Required Variables:**
110110
- `sap_vm_provision_iac_type: ansible_to_terraform`

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: false # Wh
4949
#### SAP HANA Database Server installation ####
5050
# SAP HANA Master password
5151
sap_hana_install_use_master_password: "y" # Use a master password for SAP HANA installation (y/n) (String).
52-
sap_hana_install_master_password: "ENTER_STRING_VALUE_HERE" # The master password for SAP HANA (String).
52+
sap_hana_install_master_password: "NewPass$321" # The master password for SAP HANA (String).
5353

5454
# Dynamic assignment of SAP HANA variables
5555
sap_hana_sid: "{{ sap_system_hana_db_sid }}"

deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ sap_netweaver_preconfigure_saptune_solution: 'S4HANA-APPSERVER' # SUSE saptune
5757
#### SAP HANA Database Server installation ####
5858
# SAP HANA Master password
5959
sap_hana_install_use_master_password: "y" # Use a master password for SAP HANA installation (y/n) (String).
60-
sap_hana_install_master_password: "ENTER_STRING_VALUE_HERE" # The master password for SAP HANA (String).
60+
sap_hana_install_master_password: "NewPass$321" # The master password for SAP HANA (String).
6161

6262
# SAP HANA Scale-Out variables for role sap_Hana_install
6363
sap_hana_install_new_system: true # Set to 'false', when adding hosts using sap_hana_install_addhosts

deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: false # Wh
4949
#### SAP HANA Database Server installation ####
5050
# SAP HANA Master password
5151
sap_hana_install_use_master_password: "y" # Use a master password for SAP HANA installation (y/n) (String).
52-
sap_hana_install_master_password: "ENTER_STRING_VALUE_HERE" # The master password for SAP HANA (String).
52+
sap_hana_install_master_password: "NewPass$321" # The master password for SAP HANA (String).
5353

5454
# Dynamic assignment of SAP HANA variables
5555
sap_hana_sid: "{{ sap_system_hana_db_sid }}"
@@ -123,6 +123,10 @@ sap_software_install_dictionary:
123123

124124
# SAP Business Suite 7i 2016 > EHP8 for SAP ERP 6.0 ABAP
125125
# uses SAP NetWeaver 7.5
126+
127+
# Product Availability Matrix for SAP ECC 6.0 EhP8, SAP HANA, x86_64
128+
# SAP HANA DATABASE 2.0 [>= SP059] and SAP KERNEL 7.54 64-BIT UNICODE
129+
# https://userapps.support.sap.com/sap/support/pam?hash=s%3DSAP%2520ERP%25206.0%26pvnr%3D73555000100900000247%26pt=t%7CPLTFRM%26fclfilter=G1%7CSAP%20HANA%20DATABASE%3BG2%7CLINUX%20ON%20X86_64
126130
sap_ecc6_ehp8_hana_sandbox:
127131

128132
# SWPM product catalog ID for the installation (String).

deploy_scenarios/sap_ecc_hana_sandbox/optional/ansible_extravars_interactive.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ sap_software_install_dictionary:
3434

3535
# SAP Business Suite 7i 2016 > EHP8 for SAP ERP 6.0 ABAP
3636
# uses SAP NetWeaver 7.5
37+
38+
# Product Availability Matrix for SAP ECC 6.0 EhP8, SAP HANA, x86_64
39+
# SAP HANA DATABASE 2.0 [>= SP059] and SAP KERNEL 7.54 64-BIT UNICODE
40+
# https://userapps.support.sap.com/sap/support/pam?hash=s%3DSAP%2520ERP%25206.0%26pvnr%3D73555000100900000247%26pt=t%7CPLTFRM%26fclfilter=G1%7CSAP%20HANA%20DATABASE%3BG2%7CLINUX%20ON%20X86_64
3741
sap_ecc6_ehp8_hana_sandbox:
3842

3943
# SWPM product catalog ID for the installation (String).

deploy_scenarios/sap_hana/ansible_extravars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sap_hana_preconfigure_saptune_solution: 'HANA' # SUSE saptune solution to apply
4444
#### SAP HANA Database Server installation ####
4545
# SAP HANA Master password
4646
sap_hana_install_use_master_password: "y" # Use a master password for SAP HANA installation (y/n) (String).
47-
sap_hana_install_master_password: "ENTER_STRING_VALUE_HERE" # The master password for SAP HANA (String).
47+
sap_hana_install_master_password: "NewPass$321" # The master password for SAP HANA (String).
4848

4949
# Dynamic assignment of SAP HANA variables
5050
sap_hana_sid: "{{ sap_system_hana_db_sid }}"

deploy_scenarios/sap_hana/ansible_playbook.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,6 @@
106106
when: sap_vm_provision_iac_type in ['ansible', 'ansible_to_terraform', 'existing_hosts']
107107

108108

109-
- name: Ansible Play for ensuring rsync on all hosts
110-
hosts: hana_primary
111-
become: true
112-
any_errors_fatal: true
113-
max_fail_percentage: 0
114-
tasks:
115-
116-
- name: Install rsync
117-
ansible.builtin.package:
118-
name: rsync
119-
state: present
120-
121-
122109
#### Begin downloading SAP software installation media to hosts ####
123110
- name: Ansible Play for downloading SAP HANA installation media
124111
hosts: hana_primary

deploy_scenarios/sap_hana_ha/ansible_extravars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sap_hana_preconfigure_saptune_solution: 'HANA' # SUSE saptune solution to apply
4444
#### SAP HANA Database Server installation ####
4545
# SAP HANA Master password
4646
sap_hana_install_use_master_password: "y" # Use a master password for SAP HANA installation (y/n) (String).
47-
sap_hana_install_master_password: "ENTER_STRING_VALUE_HERE" # The master password for SAP HANA (String).
47+
sap_hana_install_master_password: "NewPass$321" # The master password for SAP HANA (String).
4848

4949
# Dynamic assignment of SAP HANA variables
5050
sap_hana_sid: "{{ sap_system_hana_db_sid }}"

deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sap_hana_preconfigure_saptune_solution: 'HANA' # SUSE saptune solution to apply
4949
#### SAP HANA Database Server installation ####
5050
# SAP HANA Master password
5151
sap_hana_install_use_master_password: "y" # Use a master password for SAP HANA installation (y/n) (String).
52-
sap_hana_install_master_password: "ENTER_STRING_VALUE_HERE" # The master password for SAP HANA (String).
52+
sap_hana_install_master_password: "NewPass$321" # The master password for SAP HANA (String).
5353

5454
# SAP HANA Scale-Out variables for role sap_Hana_install
5555
sap_hana_install_new_system: true # Set to 'false', when adding hosts using sap_hana_install_addhosts

deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: false # Wh
4949
#### SAP HANA Database Server installation ####
5050
# SAP HANA Master password
5151
sap_hana_install_use_master_password: "y" # Use a master password for SAP HANA installation (y/n) (String).
52-
sap_hana_install_master_password: "ENTER_STRING_VALUE_HERE" # The master password for SAP HANA (String).
52+
sap_hana_install_master_password: "NewPass$321" # The master password for SAP HANA (String).
5353

5454
# Dynamic assignment of SAP HANA variables
5555
sap_hana_sid: "{{ sap_system_hana_db_sid }}"

0 commit comments

Comments
 (0)