diff --git a/common-dev-assets b/common-dev-assets index 52cd5dd7..ef001d79 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 52cd5dd7ae623497f188028585ff700799f59795 +Subproject commit ef001d79c2f055862a5ebecf59725e443ffb0f5b diff --git a/solutions/e2e/README.md b/solutions/e2e/README.md index fb337a19..317438cc 100644 --- a/solutions/e2e/README.md +++ b/solutions/e2e/README.md @@ -44,7 +44,7 @@ The end-to-end solution automates the following tasks: | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.0 | -| [ibm](#requirement\_ibm) | 1.79.0 | +| [ibm](#requirement\_ibm) | 1.79.2 | | [restapi](#requirement\_restapi) | 1.20.0 | | [time](#requirement\_time) | 0.13.1 | @@ -53,15 +53,15 @@ The end-to-end solution automates the following tasks: | Name | Source | Version | |------|--------|---------| | [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a | -| [standard](#module\_standard) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.5.0 | +| [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 @@ -74,7 +74,7 @@ The end-to-end solution automates the following tasks: | [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | n/a | yes | | [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 | | [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. | 
object({
    sles_hana_image = string
    sles_nw_image   = string
    rhel_hana_image = string
    rhel_nw_image   = string
  })
| 
{
  "rhel_hana_image": "RHEL9-SP4-SAP",
  "rhel_nw_image": "RHEL9-SP4-SAP-NETWEAVER",
  "sles_hana_image": "SLES15-SP6-SAP",
  "sles_nw_image": "SLES15-SP6-SAP-NETWEAVER"
}
| no | -| [powervs\_hana\_instance](#input\_powervs\_hana\_instance) | SAP HANA hostname (non FQDN) will get the form of -. 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. | 
object({
    name           = string
    sap_profile_id = string
    additional_storage_config = list(object({
      name  = string
      size  = string
      count = string
      tier  = string
      mount = string
      pool  = optional(string)
    }))
  })
| 
{
  "additional_storage_config": [
    {
      "count": "1",
      "mount": "/usr/sap",
      "name": "usrsap",
      "size": "50",
      "tier": "tier3"
    }
  ],
  "name": "hana",
  "sap_profile_id": "ush1-4x256"
}
| no | +| [powervs\_hana\_instance](#input\_powervs\_hana\_instance) | SAP HANA hostname (non FQDN) will get the form of -. 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. | 
object({
    name           = string
    sap_profile_id = string
    additional_storage_config = list(object({
      name  = string
      size  = string
      count = string
      tier  = string
      mount = string
      pool  = optional(string)
    }))
  })
| 
{
  "additional_storage_config": [
    {
      "count": "1",
      "mount": "/usr/sap",
      "name": "usrsap",
      "size": "50",
      "tier": "tier3"
    }
  ],
  "name": "hana",
  "sap_profile_id": "sh2-4x256"
}
| no | | [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. | 
list(object({
    name  = string
    size  = string
    count = string
    tier  = string
    mount = string
    pool  = optional(string)
  }))
| 
[
  {
    "count": "",
    "mount": "",
    "name": "",
    "size": "",
    "tier": ""
  }
]
| no | | [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. | 
object({
    instance_count = number
    name           = string
    processors     = string
    memory         = string
    proc_type      = string
    storage_config = list(object({
      name  = string
      size  = string
      count = string
      tier  = string
      mount = string
      pool  = optional(string)
    }))
  })
| 
{
  "instance_count": 1,
  "memory": "32",
  "name": "nw",
  "proc_type": "shared",
  "processors": "3",
  "storage_config": [
    {
      "count": "1",
      "mount": "/usr/sap",
      "name": "usrsap",
      "size": "50",
      "tier": "tier3"
    }
  ]
}
| no | | [powervs\_resource\_group\_name](#input\_powervs\_resource\_group\_name) | Existing IBM Cloud resource group name. | `string` | n/a | yes | @@ -84,7 +84,7 @@ The end-to-end solution automates the following tasks: | [sap\_domain](#input\_sap\_domain) | SAP domain to be set for entire landscape. | `string` | `"sap.com"` | no | | [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 | | [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 | -| [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). | 
object({
    rhel_image = string
    sles_image = string
  })
| 
{
  "rhel_image": "ibm-redhat-9-4-amd64-sap-applications-3",
  "sles_image": "ibm-sles-15-5-amd64-sap-applications-4"
}
| no | +| [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). | 
object({
    rhel_image = string
    sles_image = string
  })
| 
{
  "rhel_image": "ibm-redhat-9-4-amd64-sap-applications-5",
  "sles_image": "ibm-sles-15-5-amd64-sap-applications-4"
}
| no | ### Outputs diff --git a/solutions/e2e/main.tf b/solutions/e2e/main.tf index 5d6a44de..f99de41d 100644 --- a/solutions/e2e/main.tf +++ b/solutions/e2e/main.tf @@ -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 } diff --git a/solutions/e2e/variables.tf b/solutions/e2e/variables.tf index 9ba32cec..06f10df7 100644 --- a/solutions/e2e/variables.tf +++ b/solutions/e2e/variables.tf @@ -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" } } @@ -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", diff --git a/solutions/e2e/version.tf b/solutions/e2e/version.tf index e8aa67a3..2c22d2a9 100644 --- a/solutions/e2e/version.tf +++ b/solutions/e2e/version.tf @@ -3,7 +3,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.79.0" + version = "1.79.2" } time = { source = "hashicorp/time" diff --git a/solutions/ibm-catalog/sap-ready-to-go/README.md b/solutions/ibm-catalog/sap-ready-to-go/README.md index 39dce3f7..e5e71a45 100644 --- a/solutions/ibm-catalog/sap-ready-to-go/README.md +++ b/solutions/ibm-catalog/sap-ready-to-go/README.md @@ -44,7 +44,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.0 | -| [ibm](#requirement\_ibm) | 1.79.0 | +| [ibm](#requirement\_ibm) | 1.79.2 | ### Modules @@ -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 diff --git a/solutions/ibm-catalog/sap-ready-to-go/version.tf b/solutions/ibm-catalog/sap-ready-to-go/version.tf index a0124d28..c522d17b 100644 --- a/solutions/ibm-catalog/sap-ready-to-go/version.tf +++ b/solutions/ibm-catalog/sap-ready-to-go/version.tf @@ -7,7 +7,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.79.0" + version = "1.79.2" } } } diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md b/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md index 11aec518..d5aeb2ad 100644 --- a/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md +++ b/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md @@ -128,7 +128,7 @@ S4HANA_2023 | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.0 | -| [ibm](#requirement\_ibm) | 1.79.0 | +| [ibm](#requirement\_ibm) | 1.79.2 | ### Modules @@ -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 diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf b/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf index a0124d28..c522d17b 100644 --- a/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf +++ b/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf @@ -7,7 +7,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.79.0" + version = "1.79.2" } } } diff --git a/solutions/sap-ready-to-go/README.md b/solutions/sap-ready-to-go/README.md index d9967de1..39e8e0b5 100644 --- a/solutions/sap-ready-to-go/README.md +++ b/solutions/sap-ready-to-go/README.md @@ -36,7 +36,7 @@ The 'sap-ready-to-go' solution automates the following tasks: | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.0 | -| [ibm](#requirement\_ibm) | 1.79.0 | +| [ibm](#requirement\_ibm) | 1.79.2 | ### Modules diff --git a/solutions/sap-ready-to-go/version.tf b/solutions/sap-ready-to-go/version.tf index a0124d28..c522d17b 100644 --- a/solutions/sap-ready-to-go/version.tf +++ b/solutions/sap-ready-to-go/version.tf @@ -7,7 +7,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.79.0" + version = "1.79.2" } } } diff --git a/tests/go.mod b/tests/go.mod index 4b14efd3..b7a68694 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -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