Skip to content

Commit 1048b49

Browse files
feat: upgrade tf minimum version to 1.9.0 (#727)
1 parent 2e65120 commit 1048b49

File tree

18 files changed

+73
-79
lines changed

18 files changed

+73
-79
lines changed

.secrets.baseline

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-05-21T18:34:53Z",
6+
"generated_at": "2024-10-31T15:08:37Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -77,19 +77,9 @@
7777
}
7878
],
7979
"results": {
80-
"module-metadata.json": [
81-
{
82-
"hashed_secret": "ed6836bba164e8936b4aaf6b78f37a8583032364",
83-
"is_secret": false,
84-
"is_verified": false,
85-
"line_number": 798,
86-
"type": "Secret Keyword",
87-
"verified_result": null
88-
}
89-
],
9080
"modules/pi-sap-system-type1/README.md": [
9181
{
92-
"hashed_secret": "3bd02b996f65f3548c1a0b5d93b00bfa7c88341a",
82+
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
9383
"is_secret": false,
9484
"is_verified": false,
9585
"line_number": 55,
@@ -99,7 +89,7 @@
9989
],
10090
"solutions/sap-ready-to-go/README.md": [
10191
{
102-
"hashed_secret": "3bd02b996f65f3548c1a0b5d93b00bfa7c88341a",
92+
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
10393
"is_secret": false,
10494
"is_verified": false,
10595
"line_number": 61,

modules/ansible/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#####################################################
44

55
terraform {
6-
required_version = ">= 1.3"
6+
required_version = ">= 1.9.0"
77
required_providers {
88
random = {
99
source = "hashicorp/random"

modules/ibmcloud-cos/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
#####################################################
44

55
terraform {
6-
required_version = ">= 1.3"
6+
required_version = ">= 1.9.0"
77
}

modules/pi-hana-storage-config/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
#####################################################
44

55
terraform {
6-
required_version = ">= 1.3"
6+
required_version = ">= 1.9.0"
77
}

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

Lines changed: 12 additions & 12 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ locals {
2525

2626
module "pi_sharefs_instance" {
2727
source = "terraform-ibm-modules/powervs-instance/ibm"
28-
version = "2.0.2"
28+
version = "2.1.0"
2929
count = var.pi_sharefs_instance.enable ? 1 : 0
3030

3131
pi_workspace_guid = var.pi_workspace_guid
@@ -103,7 +103,7 @@ module "pi_hana_storage_calculation" {
103103

104104
module "pi_hana_instance" {
105105
source = "terraform-ibm-modules/powervs-instance/ibm"
106-
version = "2.0.2"
106+
version = "2.1.0"
107107

108108
pi_workspace_guid = var.pi_workspace_guid
109109
pi_instance_name = local.pi_hana_instance_name
@@ -141,7 +141,7 @@ resource "time_sleep" "wait_1_min" {
141141

142142
module "pi_netweaver_instance" {
143143
source = "terraform-ibm-modules/powervs-instance/ibm"
144-
version = "2.0.2"
144+
version = "2.1.0"
145145
count = var.pi_netweaver_instance.instance_count
146146
depends_on = [time_sleep.wait_1_min]
147147

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#####################################################
44

55
terraform {
6-
required_version = ">= 1.3"
6+
required_version = ">= 1.9.0"
77
required_providers {
88
# tflint-ignore: terraform_unused_required_providers
99
ibm = {
1010
source = "IBM-Cloud/ibm"
11-
version = ">= 1.67.1"
11+
version = ">= 1.70.1"
1212
}
1313
time = {
1414
source = "hashicorp/time"

solutions/e2e/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,29 @@ The end-to-end solution automates the following tasks:
4444

4545
| Variation | Available on IBM Catalog | Requires Schematics Workspace ID | Creates PowerVS with VPC landing zone | Creates PowerVS HANA Instance | Creates PowerVS NW Instances | Performs PowerVS OS Config | Performs PowerVS SAP Tuning | Install SAP software |
4646
|:---------------------------------------------------------------------------:|:------------------------:|:--------------------------------:|:-------------------------------------:|:-----------------------------:|:----------------------------:|:--------------------------:|:---------------------------:|:--------------------:|
47-
| [ End-to-End ](./) | N/A | N/A | :heavy_check_mark: | 1 | 0 to N | :heavy_check_mark: | :heavy_check_mark: | N/A |
47+
| [End-to-End](./) | N/A | N/A | :heavy_check_mark: | 1 | 0 to N | :heavy_check_mark: | :heavy_check_mark: | N/A |
4848

4949
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5050
### Requirements
5151

5252
| Name | Version |
5353
|------|---------|
54-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
55-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.68.1 |
56-
| <a name="requirement_time"></a> [time](#requirement\_time) | 0.12.0 |
54+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
55+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.70.1 |
56+
| <a name="requirement_time"></a> [time](#requirement\_time) | 0.12.1 |
5757

5858
### Modules
5959

6060
| Name | Source | Version |
6161
|------|--------|---------|
62-
| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 6.0.0 |
62+
| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 7.0.0 |
6363
| <a name="module_sap_system"></a> [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
6464

6565
### Resources
6666

6767
| Name | Type |
6868
|------|------|
69-
| [time_sleep.wait_10_mins](https://registry.terraform.io/providers/hashicorp/time/0.12.0/docs/resources/sleep) | resource |
69+
| [time_sleep.wait_10_mins](https://registry.terraform.io/providers/hashicorp/time/0.12.1/docs/resources/sleep) | resource |
7070

7171
### Inputs
7272

@@ -79,13 +79,13 @@ The end-to-end solution automates the following tasks:
7979
| <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 |
8080
| <a name="input_os_image_distro"></a> [os\_image\_distro](#input\_os\_image\_distro) | Image distribution to use for all instances(Shared, HANA, NetWeaver). OS release versions may be specified in 'var.powervs\_default\_images' optional parameters below. | `string` | n/a | yes |
8181
| <a name="input_powervs_create_separate_sharefs_instance"></a> [powervs\_create\_separate\_sharefs\_instance](#input\_powervs\_create\_separate\_sharefs\_instance) | Deploy separate IBM PowerVS instance as central file system share. All filesystems defined in 'powervs\_sharefs\_instance\_storage\_config' variable will be NFS exported and mounted on NetWeaver PowerVS instances if enabled. Optional parameter 'powervs\_share\_fs\_instance' can be configured if enabled. | `bool` | n/a | yes |
82-
| <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-SP2-SAP",<br> "rhel_nw_image": "RHEL9-SP2-SAP-NETWEAVER",<br> "sles_hana_image": "SLES15-SP5-SAP",<br> "sles_nw_image": "SLES15-SP5-SAP-NETWEAVER"<br>}</pre> | no |
83-
| <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 |
84-
| <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 |
85-
| <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 |
82+
| <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-SP2-SAP",<br/> "rhel_nw_image": "RHEL9-SP2-SAP-NETWEAVER",<br/> "sles_hana_image": "SLES15-SP5-SAP",<br/> "sles_nw_image": "SLES15-SP5-SAP-NETWEAVER"<br/>}</pre> | no |
83+
| <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 |
84+
| <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 |
85+
| <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 |
8686
| <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 |
8787
| <a name="input_powervs_sap_network_cidr"></a> [powervs\_sap\_network\_cidr](#input\_powervs\_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 |
88-
| <a name="input_powervs_sharefs_instance"></a> [powervs\_sharefs\_instance](#input\_powervs\_sharefs\_instance) | Share fs instance. This parameter is effective if 'powervs\_create\_separate\_sharefs\_instance' is set to true. 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> 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> "memory": "2",<br> "name": "share",<br> "proc_type": "shared",<br> "processors": "0.5",<br> "storage_config": [<br> {<br> "count": "1",<br> "mount": "/sapmnt",<br> "name": "sapmnt",<br> "size": "300",<br> "tier": "tier3"<br> },<br> {<br> "count": "1",<br> "mount": "/usr/trans",<br> "name": "trans",<br> "size": "50",<br> "tier": "tier3"<br> }<br> ]<br>}</pre> | no |
88+
| <a name="input_powervs_sharefs_instance"></a> [powervs\_sharefs\_instance](#input\_powervs\_sharefs\_instance) | Share fs instance. This parameter is effective if 'powervs\_create\_separate\_sharefs\_instance' is set to true. 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/> 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/> "memory": "2",<br/> "name": "share",<br/> "proc_type": "shared",<br/> "processors": "0.5",<br/> "storage_config": [<br/> {<br/> "count": "1",<br/> "mount": "/sapmnt",<br/> "name": "sapmnt",<br/> "size": "300",<br/> "tier": "tier3"<br/> },<br/> {<br/> "count": "1",<br/> "mount": "/usr/trans",<br/> "name": "trans",<br/> "size": "50",<br/> "tier": "tier3"<br/> }<br/> ]<br/>}</pre> | no |
8989
| <a name="input_powervs_zone"></a> [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS infrastructure will be created. | `string` | n/a | yes |
9090
| <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. | `string` | n/a | yes |
9191
| <a name="input_sap_domain"></a> [sap\_domain](#input\_sap\_domain) | SAP domain to be set for entire landscape. | `string` | `"sap.com"` | no |

solutions/e2e/main.tf

Lines changed: 1 addition & 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 = "6.0.0"
10+
version = "7.0.0"
1111

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

0 commit comments

Comments
 (0)