Skip to content

Commit cd7afa1

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

File tree

336 files changed

+791
-1018
lines changed

Some content is hidden

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

336 files changed

+791
-1018
lines changed

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_aws_ec2_vs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
99

1010
# Variables required for sap_vm_provision_iac_type=ansible
1111
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
12-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
13-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
12+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
13+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1414

1515
#### Infrastructure platform variables ####
1616
sap_vm_provision_iac_platform: "aws_ec2_vs" # Name of the provisioning platform (String).

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_gcp_ce_vm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
99

1010
# Variables required for sap_vm_provision_iac_type=ansible
1111
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
12-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
13-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
12+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
13+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1414
sap_vm_provision_ssh_host_public_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion public host key on execution node (String).
1515

1616
#### Infrastructure platform variables ####

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_ibmcloud_powervs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
99

1010
# Variables required for sap_vm_provision_iac_type=ansible
1111
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
12-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
13-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
12+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
13+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1414

1515
#### Infrastructure platform variables ####
1616
sap_vm_provision_iac_platform: "ibmcloud_powervs" # Name of the provisioning platform (String).

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_ibmcloud_vs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
99

1010
# Variables required for sap_vm_provision_iac_type=ansible
1111
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
12-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
13-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
12+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
13+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1414

1515
#### Infrastructure platform variables ####
1616
sap_vm_provision_iac_platform: "ibmcloud_vs" # Name of the provisioning platform (String).

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_ibmpowervm_vm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
99

1010
# Variables required for sap_vm_provision_iac_type=ansible
1111
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
12-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
13-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
12+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
13+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1414
sap_vm_provision_ssh_host_public_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion public host key on execution node (String).
1515

1616
#### Infrastructure platform variables ####

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_msazure_vm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
99

1010
# Variables required for sap_vm_provision_iac_type=ansible
1111
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
12-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
13-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
12+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
13+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1414

1515
#### Infrastructure platform variables ####
1616
sap_vm_provision_iac_platform: "msazure_vm" # Name of the provisioning platform (String).
@@ -29,7 +29,7 @@ sap_vm_provision_msazure_vnet_subnet_name: "ENTER_STRING_VALUE_HERE" # Virtual N
2929
sap_vm_provision_msazure_vm_host_os_image: "ENTER_STRING_VALUE_HERE"
3030

3131
# Variables required for sap_vm_provision_iac_type=ansible
32-
sap_vm_provision_msazure_key_pair_name_ssh_host_public_key: "" # SSH key pair name (String).
32+
sap_vm_provision_msazure_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" # SSH key pair name (String).
3333
sap_vm_provision_msazure_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_msazure_resource_group_name
3434

3535
# Variables required for sap_vm_provision_iac_type=ansible_to_terraform

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_ovirt_vm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
1111

1212
# Variables required for sap_vm_provision_iac_type=ansible
1313
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
14-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
15-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
14+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
15+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1616

1717
#### Infrastructure platform variables ####
1818
sap_vm_provision_iac_platform: "ovirt_vm" # Name of the provisioning platform (String).

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars_vmware_vm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" # Bastion user pas
1111

1212
# Variables required for sap_vm_provision_iac_type=ansible
1313
sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" # Public IP of the bastion server (String).
14-
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private SSH key on execution node (String).
15-
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion private host key on execution node (String).
14+
sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion server's SSH private key on the execution node (String).
15+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to target host's SSH private key on the execution node (String).
1616
sap_vm_provision_ssh_host_public_key_file_path: "ENTER_STRING_VALUE_HERE" # Path to bastion public host key on execution node (String).
1717

1818
#### Infrastructure platform variables ####

deploy_scenarios/sap_bw4hana_sandbox/optional/ansible_extravars_existing_hosts.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,11 @@ sap_general_preconfigure_modify_etc_hosts: true
1414
sap_general_preconfigure_domain: "{{ ansible_domain }}"
1515

1616

17-
# sap_storage role variable assignment per host
18-
sap_host_type:
19-
"{{ sap_vm_provision_existing_hosts_host_specifications_dictionary[sap_vm_provision_host_specification_plan]
20-
[inventory_hostname_short].sap_host_type }}"
21-
22-
sap_storage_setup_sid:
23-
"{{ sap_vm_provision_existing_hosts_host_specifications_dictionary[sap_vm_provision_host_specification_plan]
24-
[inventory_hostname_short].sap_storage_setup_sid }}"
25-
26-
sap_storage_setup_host_type:
27-
"{{ sap_vm_provision_existing_hosts_host_specifications_dictionary[sap_vm_provision_host_specification_plan]
28-
[inventory_hostname_short].sap_storage_setup_host_type }}"
17+
# Path to target host's SSH private key on the execution node (String).
18+
# This SSH key has to be added to authorized_keys on managed node.
19+
sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE"
2920

21+
# sap_storage role variable assignment per host
3022
sap_storage_setup_definition:
3123
"{{ sap_vm_provision_existing_hosts_host_specifications_dictionary[sap_vm_provision_host_specification_plan]
3224
[inventory_hostname_short].storage_definition }}"

deploy_scenarios/sap_bw4hana_sandbox/optional/ansible_inventory_noninteractive.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22

3-
# Ansible Inventory Group names must match sap_host_type variable - hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
3+
# Ansible Inventory Group names must match sap_host_type variable - hana_primary, hana_secondary, anydb_primary, anydb_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas
44

55
hana_primary:
66
hosts:

0 commit comments

Comments
 (0)