Skip to content

Commit 2ca1a61

Browse files
sean-freemansean-freeman
authored
Merge pull request #33 from sap-linuxlab/dev
1.0.1 patch release
2 parents b9beed0 + d7c7d44 commit 2ca1a61

File tree

203 files changed

+2855
-3442
lines changed

Some content is hidden

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

203 files changed

+2855
-3442
lines changed

‎sap_bw4hana_single_node_install/aws_ec2_instance/variable_map_os.tf

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,40 @@ variable "map_os_image_regex" {
88
default = {
99

1010
rhel-8-1 = "*RHEL-8.1*_HVM*x86_64*"
11-
12-
rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*"
13-
11+
# rhel-8-2 = "*RHEL-8.2*_HVM*x86_64*" // removed
1412
rhel-8-4 = "*RHEL-8.4*_HVM*x86_64*"
15-
1613
rhel-8-6 = "*RHEL-8.6*_HVM*x86_64*"
17-
18-
rhel-7-7-sap-ha = "*RHEL-SAP-7.7*"
19-
20-
rhel-7-9-sap-ha = "*RHEL-SAP-7.9*"
21-
14+
rhel-8-8 = "*RHEL-8.8*_HVM*x86_64*"
15+
rhel-8-10 = "*RHEL-8.10*_HVM*x86_64*"
16+
rhel-9-0 = "*RHEL-9.0*_HVM*x86_64*"
17+
rhel-9-1 = "*RHEL-9.1*_HVM*x86_64*"
18+
rhel-9-2 = "*RHEL-9.2*_HVM*x86_64*"
19+
rhel-9-3 = "*RHEL-9.3*_HVM*x86_64*"
20+
rhel-9-4 = "*RHEL-9.4*_HVM*x86_64*"
21+
22+
# rhel-7-7-sap-ha = "*RHEL-SAP-7.7*" // removed
23+
# rhel-7-9-sap-ha = "*RHEL-SAP-7.9*" // removed
2224
rhel-8-1-sap-ha = "*RHEL-SAP-8.1.0*"
23-
2425
rhel-8-2-sap-ha = "*RHEL-SAP-8.2.0*"
25-
2626
rhel-8-4-sap-ha = "*RHEL-SAP-8.4.0*"
27-
2827
rhel-8-6-sap-ha = "*RHEL-SAP-8.6.0*"
28+
rhel-8-8-sap-ha = "*RHEL-SAP-8.8.0*"
29+
rhel-8-10-sap-ha = "*RHEL-SAP-8.10.0*"
2930

30-
sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*"
31-
32-
sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*"
33-
34-
sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*"
31+
sles-12-5 = "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*"
32+
# sles-15-2 = "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" // removed
33+
# sles-15-3 = "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" // removed
34+
# sles-15-4 = "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" // removed
35+
sles-15-5 = "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*"
36+
sles-15-6 = "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*"
3537

3638
sles-12-5-sap-ha = "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*"
37-
3839
sles-15-1-sap-ha = "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*"
39-
4040
sles-15-2-sap-ha = "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*"
41-
4241
sles-15-3-sap-ha = "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*"
43-
4442
sles-15-4-sap-ha = "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*"
43+
sles-15-5-sap-ha = "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*"
44+
sles-15-6-sap-ha = "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*"
4545

4646
}
4747

‎sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bastion_ssh_port = 50222
1010

1111
host_specification_plan = "small_256gb"
1212

13-
host_os_image = "rhel-8-4-sap-ha"
13+
host_os_image = "rhel-9-2-sap-ha"
1414

1515
sap_hana_install_master_password = "NewPass$321"
1616

‎sap_bw4hana_single_node_install/gcp_ce_vm/variable_map_os.tf

Lines changed: 19 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,70 +9,25 @@ variable "map_os_image_regex" {
99

1010
default = {
1111

12-
rhel-8-latest = {
13-
project = "rhel-cloud"
14-
family = "rhel-8"
15-
},
16-
17-
rhel-7-7-sap-ha = {
18-
project = "rhel-sap-cloud"
19-
family = "rhel-7-7-sap-ha"
20-
},
21-
22-
rhel-7-9-sap-ha = {
23-
project = "rhel-sap-cloud"
24-
family = "rhel-7-9-sap-ha"
25-
},
26-
27-
rhel-8-1-sap-ha = {
28-
project = "rhel-sap-cloud"
29-
family = "rhel-8-1-sap-ha"
30-
},
31-
32-
rhel-8-2-sap-ha = {
33-
project = "rhel-sap-cloud"
34-
family = "rhel-8-2-sap-ha"
35-
},
36-
37-
rhel-8-4-sap-ha = {
38-
project = "rhel-sap-cloud"
39-
family = "rhel-8-4-sap-ha"
40-
},
41-
42-
rhel-8-6-sap-ha = {
43-
project = "rhel-sap-cloud"
44-
family = "rhel-8-6-sap-ha"
45-
},
46-
47-
sles-15-latest = {
48-
project = "suse-cloud"
49-
family = "sles-15"
50-
},
51-
52-
sles-12-sp5-sap = {
53-
project = "suse-sap-cloud"
54-
family = "sles-12-sp5-sap"
55-
},
56-
57-
sles-15-sp1-sap = {
58-
project = "suse-sap-cloud"
59-
family = "sles-15-sp1-sap"
60-
},
61-
62-
sles-15-sp2-sap = {
63-
project = "suse-sap-cloud"
64-
family = "sles-15-sp2-sap"
65-
},
66-
67-
sles-15-sp3-sap = {
68-
project = "suse-sap-cloud"
69-
family = "sles-15-sp3-sap"
70-
},
71-
72-
sles-15-sp4-sap = {
73-
project = "suse-sap-cloud"
74-
family = "sles-15-sp4-sap"
75-
},
12+
rhel-8-latest = { project = "rhel-cloud" , family = "rhel-8" },
13+
rhel-9-latest = { project = "rhel-cloud" , family = "rhel-9" },
14+
15+
sles-12-latest = { project = "suse-cloud" , family = "sles-12" },
16+
sles-15-latest = { project = "suse-cloud" , family = "sles-15" },
17+
18+
# rhel-7-7-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-7-sap-ha" }, // removed
19+
rhel-7-9-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-7-9-sap-ha" },
20+
# rhel-8-1-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-1-sap-ha" }, // removed
21+
rhel-8-2-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-2-sap-ha" },
22+
rhel-8-4-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-4-sap-ha" },
23+
rhel-8-6-sap-ha = { project = "rhel-sap-cloud" , family = "rhel-8-6-sap-ha" },
24+
25+
sles-12-sp5-sap = { project = "suse-sap-cloud" , family = "sles-12-sp5-sap" },
26+
# sles-15-sp1-sap = { project = "suse-sap-cloud" , family = "sles-15-sp1-sap" }, // removed
27+
sles-15-sp2-sap = { project = "suse-sap-cloud" , family = "sles-15-sp2-sap" },
28+
sles-15-sp3-sap = { project = "suse-sap-cloud" , family = "sles-15-sp3-sap" },
29+
sles-15-sp4-sap = { project = "suse-sap-cloud" , family = "sles-15-sp4-sap" },
30+
sles-15-sp5-sap = { project = "suse-sap-cloud" , family = "sles-15-sp5-sap" }
7631

7732
}
7833

‎sap_bw4hana_single_node_install/gcp_ce_vm/variables_generic_for_cli.tfvars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ resource_prefix = "sap"
33

44
dns_root_domain = "poc.cloud"
55

6-
bastion_os_image = "rhel-8-latest"
6+
bastion_os_image = "rhel-9-latest"
77

88
bastion_user = "bastionuser"
99

1010
bastion_ssh_port = 50222
1111

1212
host_specification_plan = "small_256gb"
1313

14-
host_os_image = "rhel-8-4-sap-ha"
14+
host_os_image = "rhel-8-6-sap-ha"
1515

1616
sap_hana_install_master_password = "NewPass$321"
1717

‎sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,11 @@ module "run_account_bootstrap_powervs_workspace_module" {
145145

146146
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_workspace?ref=main"
147147

148-
providers = { ibm = ibm.standard }
148+
# Define TF Module child provider name = TF Template parent provider name
149+
providers = {
150+
ibm.main = ibm.standard ,
151+
ibm.powervs_secure_enclave = ibm.powervs_secure_enclave
152+
}
149153

150154
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
151155
module_var_resource_prefix = var.resource_prefix
@@ -164,13 +168,18 @@ module "run_account_bootstrap_powervs_networks_module" {
164168

165169
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_powervs_networks?ref=main"
166170

167-
providers = { ibm = ibm.powervs_secure }
171+
# Define TF Module child provider name = TF Template parent provider name
172+
providers = {
173+
ibm.main = ibm.standard ,
174+
ibm.powervs_secure_enclave = ibm.powervs_secure_enclave
175+
}
168176

169-
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
170-
module_var_resource_prefix = var.resource_prefix
171-
module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location)
172-
module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid
173-
module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn
177+
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
178+
module_var_resource_prefix = var.resource_prefix
179+
module_var_ibmcloud_power_zone = lower(var.ibmcloud_powervs_location)
180+
module_var_ibmcloud_powervs_workspace_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid
181+
module_var_ibmcloud_vpc_crn = module.run_account_bootstrap_powervs_workspace_module.output_power_target_vpc_crn
182+
module_var_ibmcloud_tgw_instance_name = module.run_account_bootstrap_module.output_tgw_name
174183

175184
}
176185

@@ -186,10 +195,10 @@ module "run_powervs_interconnect_sg_update_module" {
186195

187196
providers = { ibm = ibm.standard }
188197

189-
module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id
190-
module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id
198+
module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id
199+
module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id
191200

192-
module_var_power_group_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_group_network_private_subnet
201+
module_var_power_network_private_subnet = module.run_account_bootstrap_powervs_networks_module.output_power_network_private_subnet
193202

194203
}
195204

@@ -251,14 +260,18 @@ module "run_host_provision_module" {
251260

252261
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main"
253262

254-
providers = { ibm = ibm.powervs_secure }
263+
# Define TF Module child provider name = TF Template parent provider name
264+
providers = {
265+
ibm.main = ibm.standard ,
266+
ibm.powervs_secure_enclave = ibm.powervs_secure_enclave
267+
}
255268

256269
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
257270
module_var_resource_prefix = var.resource_prefix
258271
module_var_resource_tags = var.resource_tags
259272

260-
module_var_ibm_power_group_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_group_guid
261-
module_var_power_group_networks = module.run_account_bootstrap_powervs_networks_module.output_power_group_networks
273+
module_var_ibm_power_guid = module.run_account_bootstrap_powervs_workspace_module.output_power_guid
274+
module_var_power_networks = module.run_account_bootstrap_powervs_networks_module.output_power_networks
262275

263276
module_var_ibmcloud_vpc_subnet_name = local.ibmcloud_vpc_subnet_create_boolean ? module.run_account_init_module.output_vpc_subnet_name : var.ibmcloud_vpc_subnet_name
264277

@@ -275,7 +288,8 @@ module "run_host_provision_module" {
275288
module_var_dns_root_domain_name = var.dns_root_domain
276289
module_var_dns_services_instance = module.run_account_bootstrap_module.output_host_dns_services_instance
277290

278-
module_var_dns_proxy_ip = module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip
291+
module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip
292+
279293
module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}"
280294
module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain)
281295

@@ -290,6 +304,7 @@ module "run_host_provision_module" {
290304

291305
module_var_virtual_server_hostname = each.key
292306

307+
module_var_hardware_machine_type = var.map_host_specifications[var.host_specification_plan][each.key].hardware_machine_type
293308
module_var_virtual_server_profile = var.map_host_specifications[var.host_specification_plan][each.key].virtual_server_profile
294309

295310
module_var_storage_definition = [ for storage_item in var.map_host_specifications[var.host_specification_plan][each.key]["storage_definition"] : storage_item if contains(keys(storage_item),"disk_size") && try(storage_item.swap_path,"") == "" ]

‎sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_hosts.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ variable "map_host_specifications" {
1010
small_256gb = {
1111

1212
bwh01 = { // Hostname
13+
hardware_machine_type = "e1080"
1314
virtual_server_profile = "ush1-4x256"
1415
// An IBM PowerVS host will be set to Tier 1 or Tier 3 storage type, and cannot use block storage volumes from both storage types
1516
// Therefore all block storage volumes are provisioned with Tier 1 (this cannot be changed once provisioned)

‎sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_locations.tf

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11

2-
32
variable "map_ibm_powervs_to_vpc_az" {
43

54
description = "Map of IBM Power VS location to the colocated IBM Cloud VPC Infrastructure Availability Zone"
65

76
type = map(any)
87

98
default = {
10-
9+
dal10 = "us-south-1"
1110
dal12 = "us-south-2"
12-
us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13'
13-
us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04'
14-
# wdc06 = "us-east-2" // No Cloud Connection available at this location
11+
us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13'
12+
us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04'
13+
wdc06 = "us-east-2"
14+
wdc07 = "us-east-3"
1515
sao01 = "br-sao-1"
16+
sao02 = "br-sao-2"
1617
tor01 = "ca-tor-1"
17-
eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04'
18-
eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05'
18+
eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04'
19+
eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05'
1920
lon04 = "eu-gb-1"
2021
lon06 = "eu-gb-3"
22+
mad02 = "eu-es-1"
23+
mad04 = "eu-es-2"
2124
syd04 = "au-syd-2"
2225
syd05 = "au-syd-3"
2326
tok04 = "jp-tok-2"
2427
osa21 = "jp-osa-1"
25-
2628
}
2729

2830
}
@@ -37,22 +39,25 @@ variable "map_ibm_powervs_location_to_powervs_region" {
3739
type = map(any)
3840

3941
default = {
40-
42+
dal10 = "us-south"
4143
dal12 = "us-south"
4244
us-south = "us-south"
4345
us-east = "us-east"
44-
# wdc06 = "us-east" // no Cloud Connection available at this location
46+
wdc06 = "us-east" // no Cloud Connection available at this location
47+
wdc07 = "us-east" // no Cloud Connection available at this location
4548
sao01 = "sao"
49+
sao02 = "sao"
4650
tor01 = "tor"
4751
eu-de-1 = "eu-de"
4852
eu-de-2 = "eu-de"
4953
lon04 = "lon"
5054
lon06 = "lon"
55+
mad02 = "mad"
56+
mad04 = "mad"
5157
syd04 = "syd"
5258
syd05 = "syd"
5359
tok04 = "tok"
5460
osa21 = "osa"
55-
5661
}
5762

5863
}

‎sap_bw4hana_single_node_install/ibmcloud_powervs/variable_map_os.tf

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,30 @@ variable "map_os_image_regex" {
77

88
default = {
99

10-
rhel-8-4 = ".*redhat.*8-4.*minimal.*amd64.*"
11-
12-
rhel-8-1-sap-ha-byol = "Linux-RHEL-SAP-8-1"
13-
14-
sles-12-4-sap-ha-byol = "Linux-SUSE-SAP-12-4"
10+
# OS Image keys for IBM Cloud Virtual Server (Bastion and Proxy)
11+
rhel-8-8 = ".*redhat.*8-8.*minimal.*amd64.*"
12+
rhel-8-10 = ".*redhat.*8-10.*minimal.*amd64.*"
13+
rhel-9-2 = ".*redhat.*9-2.*minimal.*amd64.*"
14+
rhel-9-4 = ".*redhat.*9-4.*minimal.*amd64.*"
15+
16+
# OS Image keys for IBM Power Virtual Server
17+
rhel-8-4-sap-ha = "RHEL8-SP4-SAP"
18+
rhel-8-4-sap-ha-byol = "RHEL8-SP4-SAP-BYOL"
19+
rhel-8-6-sap-ha = "RHEL8-SP6-SAP"
20+
rhel-8-6-sap-ha-byol = "RHEL8-SP6-SAP-BYOL"
21+
rhel-8-8-sap-ha = "RHEL8-SP8-SAP"
22+
rhel-8-8-sap-ha-byol = "RHEL8-SP8-SAP-BYOL"
23+
rhel-9-2-sap-ha = "RHEL9-SP2-SAP"
24+
rhel-9-2-sap-ha-byol = "RHEL9-SP2-SAP-BYOL"
25+
26+
sles-15-2-sap-ha = "SLES15-SP2-SAP"
27+
sles-15-2-sap-ha-byol = "SLES15-SP2-SAP-BYOL"
28+
sles-15-3-sap-ha = "SLES15-SP3-SAP"
29+
sles-15-3-sap-ha-byol = "SLES15-SP3-SAP-BYOL"
30+
sles-15-4-sap-ha = "SLES15-SP4-SAP"
31+
sles-15-4-sap-ha-byol = "SLES15-SP4-SAP-BYOL"
32+
sles-15-5-sap-ha = "SLES15-SP5-SAP"
33+
sles-15-5-sap-ha-byol = "SLES15-SP5-SAP-BYOL"
1534

1635
}
1736

0 commit comments

Comments
 (0)