Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-dev-assets
12 changes: 6 additions & 6 deletions solutions/e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The end-to-end solution automates the following tasks:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.2 |
| <a name="requirement_restapi"></a> [restapi](#requirement\_restapi) | 1.20.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | 0.13.1 |

Expand All @@ -53,15 +53,15 @@ The end-to-end solution automates the following tasks:
| Name | Source | Version |
|------|--------|---------|
| <a name="module_sap_system"></a> [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
| <a name="module_standard"></a> [standard](#module\_standard) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.5.0 |
| <a name="module_standard"></a> [standard](#module\_standard) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.5.1 |

### Resources

| Name | Type |
|------|------|
| [time_sleep.wait_15_mins](https://registry.terraform.io/providers/hashicorp/time/0.13.1/docs/resources/sleep) | resource |
| [ibm_iam_auth_token.auth_token](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/iam_auth_token) | data source |
| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_catalog_images) | data source |
| [ibm_iam_auth_token.auth_token](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/iam_auth_token) | data source |
| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/pi_catalog_images) | data source |

### Inputs

Expand All @@ -74,7 +74,7 @@ The end-to-end solution automates the following tasks:
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | n/a | yes |
| <a name="input_os_image_distro"></a> [os\_image\_distro](#input\_os\_image\_distro) | Image distribution to use for all instances(HANA, NetWeaver). OS release versions may be specified in 'var.powervs\_default\_images' optional parameters below. | `string` | n/a | yes |
| <a name="input_powervs_default_sap_images"></a> [powervs\_default\_sap\_images](#input\_powervs\_default\_sap\_images) | Default SUSE and Red Hat Linux images to use for SAP HANA and SAP NetWeaver PowerVS instances. | <pre>object({<br/> sles_hana_image = string<br/> sles_nw_image = string<br/> rhel_hana_image = string<br/> rhel_nw_image = string<br/> })</pre> | <pre>{<br/> "rhel_hana_image": "RHEL9-SP4-SAP",<br/> "rhel_nw_image": "RHEL9-SP4-SAP-NETWEAVER",<br/> "sles_hana_image": "SLES15-SP6-SAP",<br/> "sles_nw_image": "SLES15-SP6-SAP-NETWEAVER"<br/>}</pre> | no |
| <a name="input_powervs_hana_instance"></a> [powervs\_hana\_instance](#input\_powervs\_hana\_instance) | SAP HANA hostname (non FQDN) will get the form of <var.prefix>-<var.pi\_hana\_instance\_name>. SAP HANA profile to use. Must be one of the supported profiles. See [here](https://cloud.ibm.com/docs/sap?topic=sap-hana-iaas-offerings-profiles-power-vs). File system sizes are automatically calculated. Override automatic calculation by setting values in optional 'pi\_hana\_instance\_custom\_storage\_config' parameter. 'additional\_storage\_config' additional file systems to be created and attached to PowerVS instance for SAP HANA. '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/> name = string<br/> sap_profile_id = string<br/> additional_storage_config = list(object({<br/> name = string<br/> size = string<br/> count = string<br/> tier = string<br/> mount = string<br/> pool = optional(string)<br/> }))<br/> })</pre> | <pre>{<br/> "additional_storage_config": [<br/> {<br/> "count": "1",<br/> "mount": "/usr/sap",<br/> "name": "usrsap",<br/> "size": "50",<br/> "tier": "tier3"<br/> }<br/> ],<br/> "name": "hana",<br/> "sap_profile_id": "ush1-4x256"<br/>}</pre> | no |
| <a name="input_powervs_hana_instance"></a> [powervs\_hana\_instance](#input\_powervs\_hana\_instance) | SAP HANA hostname (non FQDN) will get the form of <var.prefix>-<var.pi\_hana\_instance\_name>. SAP HANA profile to use. Must be one of the supported profiles. See [here](https://cloud.ibm.com/docs/sap?topic=sap-hana-iaas-offerings-profiles-power-vs). File system sizes are automatically calculated. Override automatic calculation by setting values in optional 'pi\_hana\_instance\_custom\_storage\_config' parameter. 'additional\_storage\_config' additional file systems to be created and attached to PowerVS instance for SAP HANA. '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/> name = string<br/> sap_profile_id = string<br/> additional_storage_config = list(object({<br/> name = string<br/> size = string<br/> count = string<br/> tier = string<br/> mount = string<br/> pool = optional(string)<br/> }))<br/> })</pre> | <pre>{<br/> "additional_storage_config": [<br/> {<br/> "count": "1",<br/> "mount": "/usr/sap",<br/> "name": "usrsap",<br/> "size": "50",<br/> "tier": "tier3"<br/> }<br/> ],<br/> "name": "hana",<br/> "sap_profile_id": "sh2-4x256"<br/>}</pre> | no |
| <a name="input_powervs_hana_instance_custom_storage_config"></a> [powervs\_hana\_instance\_custom\_storage\_config](#input\_powervs\_hana\_instance\_custom\_storage\_config) | Custom File systems to be created and attached to PowerVS instance for SAP HANA. '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>list(object({<br/> name = string<br/> size = string<br/> count = string<br/> tier = string<br/> mount = string<br/> pool = optional(string)<br/> }))</pre> | <pre>[<br/> {<br/> "count": "",<br/> "mount": "",<br/> "name": "",<br/> "size": "",<br/> "tier": ""<br/> }<br/>]</pre> | no |
| <a name="input_powervs_netweaver_instance"></a> [powervs\_netweaver\_instance](#input\_powervs\_netweaver\_instance) | 'instance\_count' is number of SAP NetWeaver instances that should be created. '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/> 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/> pool = optional(string)<br/> }))<br/> })</pre> | <pre>{<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 |
| <a name="input_powervs_resource_group_name"></a> [powervs\_resource\_group\_name](#input\_powervs\_resource\_group\_name) | Existing IBM Cloud resource group name. | `string` | n/a | yes |
Expand All @@ -84,7 +84,7 @@ The end-to-end solution automates the following tasks:
| <a name="input_sap_domain"></a> [sap\_domain](#input\_sap\_domain) | SAP domain to be set for entire landscape. | `string` | `"sap.com"` | no |
| <a name="input_ssh_private_key"></a> [ssh\_private\_key](#input\_ssh\_private\_key) | Private SSH key (RSA format) used to login to IBM PowerVS instances. Should match to the public SSH key referenced by 'ssh\_public\_key' which was created previously. The key is temporarily stored and deleted. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys). | `string` | n/a | yes |
| <a name="input_ssh_public_key"></a> [ssh\_public\_key](#input\_ssh\_public\_key) | Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region. | `string` | n/a | yes |
| <a name="input_vpc_intel_images"></a> [vpc\_intel\_images](#input\_vpc\_intel\_images) | Stock OS image names for creating VPC landing zone VSI instances: RHEL (management and network services) and SLES (monitoring). | <pre>object({<br/> rhel_image = string<br/> sles_image = string<br/> })</pre> | <pre>{<br/> "rhel_image": "ibm-redhat-9-4-amd64-sap-applications-3",<br/> "sles_image": "ibm-sles-15-5-amd64-sap-applications-4"<br/>}</pre> | no |
| <a name="input_vpc_intel_images"></a> [vpc\_intel\_images](#input\_vpc\_intel\_images) | Stock OS image names for creating VPC landing zone VSI instances: RHEL (management and network services) and SLES (monitoring). | <pre>object({<br/> rhel_image = string<br/> sles_image = string<br/> })</pre> | <pre>{<br/> "rhel_image": "ibm-redhat-9-4-amd64-sap-applications-5",<br/> "sles_image": "ibm-sles-15-5-amd64-sap-applications-4"<br/>}</pre> | no |

### Outputs

Expand Down
2 changes: 1 addition & 1 deletion solutions/e2e/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

module "standard" {
source = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone"
version = "8.5.0"
version = "8.5.1"

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

Expand Down
4 changes: 2 additions & 2 deletions solutions/e2e/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ variable "vpc_intel_images" {
sles_image = string
})
default = {
"rhel_image" : "ibm-redhat-9-4-amd64-sap-applications-3"
"rhel_image" : "ibm-redhat-9-4-amd64-sap-applications-5"
"sles_image" : "ibm-sles-15-5-amd64-sap-applications-4"
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ variable "powervs_hana_instance" {
})
default = {
name = "hana"
sap_profile_id = "ush1-4x256"
sap_profile_id = "sh2-4x256"
additional_storage_config = [{
"name" : "usrsap",
"size" : "50",
Expand Down
2 changes: 1 addition & 1 deletion solutions/e2e/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.79.0"
version = "1.79.2"
}
time = {
source = "hashicorp/time"
Expand Down
10 changes: 5 additions & 5 deletions solutions/ibm-catalog/sap-ready-to-go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.2 |

### Modules

Expand All @@ -56,10 +56,10 @@

| Name | Type |
|------|------|
| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_catalog_images) | data source |
| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_image) | data source |
| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_output) | data source |
| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_workspace) | data source |
| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/pi_catalog_images) | data source |
| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/pi_image) | data source |
| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/schematics_output) | data source |
| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/schematics_workspace) | data source |

### Inputs

Expand Down
2 changes: 1 addition & 1 deletion solutions/ibm-catalog/sap-ready-to-go/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.79.0"
version = "1.79.2"
}
}
}
10 changes: 5 additions & 5 deletions solutions/ibm-catalog/sap-s4hana-bw4hana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ S4HANA_2023
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.2 |

### Modules

Expand All @@ -146,10 +146,10 @@ S4HANA_2023

| Name | Type |
|------|------|
| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_catalog_images) | data source |
| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/pi_image) | data source |
| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_output) | data source |
| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.0/docs/data-sources/schematics_workspace) | data source |
| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/pi_catalog_images) | data source |
| [ibm_pi_image.custom_images](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/pi_image) | data source |
| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/schematics_output) | data source |
| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.79.2/docs/data-sources/schematics_workspace) | data source |

### Inputs

Expand Down
2 changes: 1 addition & 1 deletion solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.79.0"
version = "1.79.2"
}
}
}
2 changes: 1 addition & 1 deletion solutions/sap-ready-to-go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The 'sap-ready-to-go' solution automates the following tasks:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.79.2 |

### Modules

Expand Down
2 changes: 1 addition & 1 deletion solutions/sap-ready-to-go/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.79.0"
version = "1.79.2"
}
}
}
2 changes: 1 addition & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/terraform-ibm-modules/terraform-ibm-powervs-sap

go 1.23.0

toolchain go1.24.3
toolchain go1.24.4

require (
github.com/gruntwork-io/terratest v0.49.0
Expand Down