Skip to content

Commit e717c9e

Browse files
feat: default to p10 for netweaver instances in supported regions (#809)
--------- Co-authored-by: Terraform IBM Modules Operations <[email protected]>
1 parent fa63a9a commit e717c9e

File tree

15 files changed

+54
-36
lines changed

15 files changed

+54
-36
lines changed

ibm_catalog.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
{
367367
"diagram": {
368368
"caption": "Full SAP environment provisioned on a 'Power Virtual Server with VPC landing zone'",
369-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.0.0/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg",
369+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.1.0/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg",
370370
"type": "image/svg+xml"
371371
},
372372
"description": "'SAP ready PowerVS' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape builds on the foundation of the 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and preconfigured for SAP installation.\n\nServices such as DNS, NTP and NFS running in VPC and provided by 'Power Virtual Server with VPC landing zone' are leveraged.\n\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management and the network connectivity configuration provided by 'Power Virtual Server with VPC landing zone'."
@@ -767,7 +767,7 @@
767767
{
768768
"diagram": {
769769
"caption": "Full SAP S/4HANA or BW/4HANA environment provisioned on a 'Power Virtual Server with VPC landing zone'",
770-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.0.0/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
770+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.1.0/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
771771
"type": "image/svg+xml"
772772
},
773773
"description": "'SAP S/4HANA or BW/4HANA' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape builds on the foundation of 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and preconfigured for SAP installation. S/4HANA or BW/4HANA solution is installed based on selected version. \n\nServices such as DNS, NTP and NFS running in VPC and provided by 'Power Virtual Server with VPC landing zone' are leveraged.\n\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management and the network connectivity configuration provided by the 'Power Virtual Server with VPC landing zone'. Additionally if a Monitoring Instance was configured in the 'Power Virtual Server with VPC landing zone' deployment, this solution will then install and enable SAP monitoring Dashboard."

modules/pi-sap-system-type1/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ The Power Virtual Server for SAP module automates the following tasks:
3232
| <a name="module_ansible_pi_netweaver_secondary_instances_sapmnt_mount"></a> [ansible\_pi\_netweaver\_secondary\_instances\_sapmnt\_mount](#module\_ansible\_pi\_netweaver\_secondary\_instances\_sapmnt\_mount) | ../ansible | n/a |
3333
| <a name="module_ansible_sap_instance_init"></a> [ansible\_sap\_instance\_init](#module\_ansible\_sap\_instance\_init) | ../ansible | n/a |
3434
| <a name="module_configure_scc_wp_agent"></a> [configure\_scc\_wp\_agent](#module\_configure\_scc\_wp\_agent) | ../ansible | n/a |
35-
| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.6.0 |
35+
| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.6.1 |
3636
| <a name="module_pi_hana_storage_calculation"></a> [pi\_hana\_storage\_calculation](#module\_pi\_hana\_storage\_calculation) | ../pi-hana-storage-config | n/a |
37-
| <a name="module_pi_netweaver_primary_instance"></a> [pi\_netweaver\_primary\_instance](#module\_pi\_netweaver\_primary\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.6.0 |
38-
| <a name="module_pi_netweaver_secondary_instances"></a> [pi\_netweaver\_secondary\_instances](#module\_pi\_netweaver\_secondary\_instances) | terraform-ibm-modules/powervs-instance/ibm | 2.6.0 |
37+
| <a name="module_pi_netweaver_primary_instance"></a> [pi\_netweaver\_primary\_instance](#module\_pi\_netweaver\_primary\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.6.1 |
38+
| <a name="module_pi_netweaver_secondary_instances"></a> [pi\_netweaver\_secondary\_instances](#module\_pi\_netweaver\_secondary\_instances) | terraform-ibm-modules/powervs-instance/ibm | 2.6.1 |
3939

4040
### Resources
4141

@@ -55,6 +55,7 @@ The Power Virtual Server for SAP module automates the following tasks:
5555
| <a name="input_pi_instance_init_linux"></a> [pi\_instance\_init\_linux](#input\_pi\_instance\_init\_linux) | Configures a PowerVS linux instance to have internet access by setting proxy on it, updates os and create filesystems using ansible collection [ibm.power\_linux\_sap collection](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/) where 'bastion\_host\_ip' is public IP of bastion/jump host to access the 'ansible\_host\_or\_ip' private IP of ansible node. This ansible host must have access to the power virtual server instance and ansible host OS must be RHEL distribution. | <pre>object(<br/> {<br/> enable = bool<br/> bastion_host_ip = string<br/> ansible_host_or_ip = string<br/> ssh_private_key = string<br/> custom_os_registration = optional(object({<br/> username = string<br/> password = string<br/> }))<br/> }<br/> )</pre> | n/a | yes |
5656
| <a name="input_pi_netweaver_instance"></a> [pi\_netweaver\_instance](#input\_pi\_netweaver\_instance) | PowerVS SAP NetWeaver instance hostname (non FQDN). Will get the form of <var.prefix>-<var.powervs\_netweaver\_instance\_name>-<number>. Max length of final hostname must be <= 13 characters. 'instance\_count' is number of SAP NetWeaver instances that should be created. 'instance\_count' cannot exceed 10. 'size' is in GB. 'count' specify over how many storage volumes the file system will be striped. 'tier' specifies the storage tier in PowerVS workspace. 'mount' specifies the target mount point on OS. | <pre>object({<br/> instance_count = number<br/> name = string<br/> image_id = string<br/> processors = string<br/> memory = string<br/> proc_type = string<br/> storage_config = list(object({<br/> name = string<br/> size = string<br/> count = string<br/> tier = string<br/> mount = string<br/> }))<br/> })</pre> | <pre>{<br/> "image_id": "insert_value_here",<br/> "instance_count": 1,<br/> "memory": "32",<br/> "name": "nw",<br/> "proc_type": "shared",<br/> "processors": "3",<br/> "storage_config": [<br/> {<br/> "count": "1",<br/> "mount": "/usr/sap",<br/> "name": "usrsap",<br/> "size": "50",<br/> "tier": "tier3"<br/> }<br/> ]<br/>}</pre> | no |
5757
| <a name="input_pi_networks"></a> [pi\_networks](#input\_pi\_networks) | Existing list of subnets to be attached to PowerVS instances. The first element will become the primary interface. Run 'ibmcloud pi networks' to list available private subnets. | <pre>list(<br/> object({<br/> name = string<br/> id = string<br/> cidr = optional(string)<br/> })<br/> )</pre> | n/a | yes |
58+
| <a name="input_pi_region"></a> [pi\_region](#input\_pi\_region) | The region of the PowerVS workspace where the instances will be deployed. Needed to determine server type for NetWeaver instances. | `string` | n/a | yes |
5859
| <a name="input_pi_sap_network_cidr"></a> [pi\_sap\_network\_cidr](#input\_pi\_sap\_network\_cidr) | Additional private subnet for SAP communication which will be created. CIDR for SAP network. E.g., '10.53.0.0/24' | `string` | `"10.53.0.0/24"` | no |
5960
| <a name="input_pi_ssh_public_key_name"></a> [pi\_ssh\_public\_key\_name](#input\_pi\_ssh\_public\_key\_name) | Existing PowerVS SSH Public Key Name. | `string` | n/a | yes |
6061
| <a name="input_pi_workspace_guid"></a> [pi\_workspace\_guid](#input\_pi\_workspace\_guid) | PowerVS infrastructure workspace guid. The GUID of the resource instance. | `string` | n/a | yes |

modules/pi-sap-system-type1/main.tf

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ locals {
1515
pi_networks = concat(var.pi_networks, [local.pi_sap_network])
1616
}
1717

18+
#####################################################
19+
# Set server type based on region
20+
#####################################################
21+
locals {
22+
p10_unsupported_regions = ["che01", "lon04", "lon06", "mon01", "syd04", "syd05", "tor01", "us-east", "us-south"] # datacenters that don't support P10 yet
23+
server_type = contains(local.p10_unsupported_regions, var.pi_region) ? "s922" : "s1022"
24+
}
25+
1826
#####################################################
1927
# Networks getting attached in random order hotfix
2028
#####################################################
@@ -48,7 +56,7 @@ module "pi_hana_storage_calculation" {
4856

4957
module "pi_hana_instance" {
5058
source = "terraform-ibm-modules/powervs-instance/ibm"
51-
version = "2.6.0"
59+
version = "2.6.1"
5260

5361
pi_workspace_guid = var.pi_workspace_guid
5462
pi_instance_name = local.pi_hana_instance_name
@@ -93,7 +101,7 @@ resource "time_sleep" "wait_1_min" {
93101

94102
module "pi_netweaver_primary_instance" {
95103
source = "terraform-ibm-modules/powervs-instance/ibm"
96-
version = "2.6.0"
104+
version = "2.6.1"
97105
count = var.pi_netweaver_instance.instance_count > 0 ? 1 : 0
98106
depends_on = [time_sleep.wait_1_min]
99107

@@ -106,7 +114,7 @@ module "pi_netweaver_primary_instance" {
106114
pi_boot_image_storage_tier = "tier3"
107115
pi_number_of_processors = var.pi_netweaver_instance.processors
108116
pi_memory_size = var.pi_netweaver_instance.memory
109-
pi_server_type = "s922"
117+
pi_server_type = local.server_type
110118
pi_cpu_proc_type = var.pi_netweaver_instance.proc_type
111119
pi_storage_config = local.pi_netweaver_primary_instance_storage_config
112120
pi_instance_init_linux = var.pi_instance_init_linux
@@ -142,7 +150,7 @@ module "ansible_pi_netweaver_primary_instance_exportfs" {
142150

143151
module "pi_netweaver_secondary_instances" {
144152
source = "terraform-ibm-modules/powervs-instance/ibm"
145-
version = "2.6.0"
153+
version = "2.6.1"
146154
count = var.pi_netweaver_instance.instance_count > 1 ? var.pi_netweaver_instance.instance_count - 1 : 0
147155
depends_on = [time_sleep.wait_1_min]
148156

@@ -155,7 +163,7 @@ module "pi_netweaver_secondary_instances" {
155163
pi_boot_image_storage_tier = "tier3"
156164
pi_number_of_processors = var.pi_netweaver_instance.processors
157165
pi_memory_size = var.pi_netweaver_instance.memory
158-
pi_server_type = "s922"
166+
pi_server_type = local.server_type
159167
pi_cpu_proc_type = var.pi_netweaver_instance.proc_type
160168
pi_storage_config = var.pi_netweaver_instance.storage_config
161169
pi_instance_init_linux = var.pi_instance_init_linux

modules/pi-sap-system-type1/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ variable "pi_workspace_guid" {
88
type = string
99
}
1010

11+
variable "pi_region" {
12+
description = "The region of the PowerVS workspace where the instances will be deployed. Needed to determine server type for NetWeaver instances."
13+
type = string
14+
}
15+
1116
variable "pi_ssh_public_key_name" {
1217
description = "Existing PowerVS SSH Public Key Name."
1318
type = string

reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
copyright:
44
years: 2024, 2025
5-
lastupdated: "2025-03-26"
5+
lastupdated: "2025-04-16"
66
keywords:
77
subcollection: deployable-reference-architectures
88
authors:
@@ -17,7 +17,7 @@ use-case: ITServiceManagement
1717
industry: Technology
1818
compliance: SAPCertified
1919
content-type: reference-architecture
20-
version: v4.0.0
20+
version: v4.1.0
2121
related_links:
2222
- title: 'SAP in IBM Cloud documentation'
2323
url: 'https://cloud.ibm.com/docs/sap'
@@ -39,7 +39,7 @@ related_links:
3939
{: toc-industry="Technology"}
4040
{: toc-use-case="ITServiceManagement"}
4141
{: toc-compliance="SAPCertified"}
42-
{: toc-version="v4.0.0"}
42+
{: toc-version="v4.1.0"}
4343

4444
The SAP-ready PowerVS variation of the Power Virtual Server for SAP HANA creates a basic and expandable SAP system landscape. The variation builds on the foundation of the VPC landing zone and Power Virtual Server with VPC landing zone. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and pre-configured for SAP installation.
4545

reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
copyright:
44
years: 2024, 2025
5-
lastupdated: "2025-03-26"
5+
lastupdated: "2025-04-16"
66
keywords:
77
subcollection: deployable-reference-architectures
88
authors:
@@ -17,7 +17,7 @@ use-case: ITServiceManagement
1717
industry: Technology
1818
compliance: SAPCertified
1919
content-type: reference-architecture
20-
version: v4.0.0
20+
version: v4.1.0
2121
related_links:
2222
- title: 'SAP in IBM Cloud documentation'
2323
url: 'https://cloud.ibm.com/docs/sap'
@@ -39,7 +39,7 @@ related_links:
3939
{: toc-industry="Technology"}
4040
{: toc-use-case="ITServiceManagement"}
4141
{: toc-compliance="SAPCertified"}
42-
{: toc-version="v4.0.0"}
42+
{: toc-version="v4.1.0"}
4343

4444
'SAP S/4HANA or BW/4HANA' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape built on the foundation of 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and pre-configured for SAP installation. The S/4HANA or BW/4HANA solution is installed based on the selected version.
4545

solutions/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The end-to-end solution automates the following tasks:
5757

5858
| Name | Source | Version |
5959
|------|--------|---------|
60-
| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.2.2 |
60+
| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.3.0 |
6161
| <a name="module_sap_system"></a> [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
6262

6363
### Resources

solutions/e2e/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
module "powervs_infra" {
99
source = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone"
10-
version = "8.2.2"
10+
version = "8.3.0"
1111

1212
providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi, ibm.ibm-sm = ibm.ibm-sm }
1313

@@ -70,6 +70,7 @@ module "sap_system" {
7070

7171
prefix = var.prefix
7272
pi_workspace_guid = module.powervs_infra.powervs_workspace_guid
73+
pi_region = var.powervs_zone
7374
pi_ssh_public_key_name = module.powervs_infra.powervs_ssh_public_key.name
7475
pi_networks = local.powervs_networks
7576
pi_sap_network_cidr = var.powervs_sap_network_cidr

solutions/ibm-catalog/sap-ready-to-go/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module "sap_system" {
2828

2929
prefix = var.prefix
3030
pi_workspace_guid = local.powervs_workspace_guid
31+
pi_region = var.powervs_zone
3132
pi_ssh_public_key_name = local.powervs_sshkey_name
3233
pi_networks = local.powervs_networks
3334
pi_sap_network_cidr = var.powervs_sap_network_cidr

0 commit comments

Comments
 (0)