feat: upgrade tf version to 1.60.0 and slz to 5.3.1 (#718)

* feat: upgrade tf version to 1.60.0 (#709)

* feat: upgrade ibmi and aix images (#710)

* ci: update quickstart images

* docs: toc version

* fix: json format for custom_profile

* fix: json format for custom_profile

* feat: upgrade landing zone to v5.3.1
BREAKING CHANGE: floating ip recreated in correct resource group, v5.3.0

* docs: change toc version
BREAKING CHANGE: floating ip recreated in correct resource group, v5.3.0

Author: surajsbharadwaj

ibm_catalog.json

@@ -537,35 +537,39 @@
                             "required": true,
                             "options": [
                                 {
-                                    "displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-01-01)",
+                                    "displayname": "Custom (Configure in optional parameters)",
+                                    "value": "custom"
+                                },
+                                {
+                                    "displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-01-02)",
                                     "value": "aix_xs"
                                 },
                                 {
-                                    "displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-01-01)",
+                                    "displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-01-02)",
                                     "value": "aix_s"
                                 },
                                 {
-                                    "displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-01-01)",
+                                    "displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-01-02)",
                                     "value": "aix_m"
                                 },
                                 {
-                                    "displayname": "AIX - L (15cpu,512GB,disk-2000GB,7300-01-01)",
+                                    "displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-01-02)",
                                     "value": "aix_l"
                                 },
                                 {
-                                    "displayname": "IBM i - XS (0.25cpu,8GB,disk-100GB,IBMi-75-01-2984-2)",
+                                    "displayname": "IBM i - XS (0.25cpu,8GB,disk-100GB,IBMi-75-02-2924-1)",
                                     "value": "ibm_i_xs"
                                 },
                                 {
-                                    "displayname": "IBM i - S (1cpu,32GB,disk-500GB,IBMi-75-01-2984-2)",
+                                    "displayname": "IBM i - S (1cpu,32GB,disk-500GB,IBMi-75-02-2924-1)",
                                     "value": "ibm_i_s"
                                 },
                                 {
-                                    "displayname": "IBM i - M (2cpu,64GB,disk-1000GB,IBMi-75-01-2984-2)",
+                                    "displayname": "IBM i - M (2cpu,64GB,disk-1000GB,IBMi-75-02-2924-1)",
                                     "value": "ibm_i_m"
                                 },
                                 {
-                                    "displayname": "IBM i - L (4cpu,132GB,disk-2000GB,IBMi-75-01-2984-2)",
+                                    "displayname": "IBM i - L (4cpu,132GB,disk-2000GB,IBMi-75-02-2924-1)",
                                     "value": "ibm_i_l"
                                 },
                                 {
@@ -624,39 +628,39 @@
                         {
                             "key": "custom_profile_instance_boot_image",
                             "type": "string",
-                            "default_value": "SLES15-SP4-SAP",
+                            "default_value": "none",
                             "options": [
                                 {
                                     "displayname": "None",
-                                    "value": "SLES15-SP4-SAP"
+                                    "value": "none"
                                 },
                                 {
-                                    "displayname": "AIX - 7300-01-01",
-                                    "value": "7300-01-01"
+                                    "displayname": "AIX - 7300-01-02",
+                                    "value": "7300-01-02"
                                 },
                                 {
-                                    "displayname": "AIX - 7300-00-01",
-                                    "value": "7300-00-01"
+                                    "displayname": "AIX - 7200-05-06",
+                                    "value": "7200-05-06"
                                 },
                                 {
-                                    "displayname": "AIX - 7200-05-03",
-                                    "value": "7200-05-03"
+                                    "displayname": "AIX - 7100-05-09",
+                                    "value": "7100-05-09"
                                 },
                                 {
-                                    "displayname": "IBM i - IBMi-75-01-2984-2",
-                                    "value": "IBMi-75-01-2984-2"
+                                    "displayname": "IBM i - IBMi-75-02-2924-1",
+                                    "value": "IBMi-75-02-2924-1"
                                 },
                                 {
-                                    "displayname": "IBM i - IBMi-75-01-2924-2",
-                                    "value": "IBMi-75-01-2924-2"
+                                    "displayname": "IBM i - IBMi-75-02-2984-1",
+                                    "value": "IBMi-75-02-2984-1"
                                 },
                                 {
-                                    "displayname": "IBM i - IBMi-74-07-2984-1",
-                                    "value": "IBMi-74-07-2984-1"
+                                    "displayname": "IBM i - IBMi-74-08-2984-1",
+                                    "value": "IBMi-74-08-2984-1"
                                 },
                                 {
-                                    "displayname": "IBM i - IBMi_COR-74-07-2",
-                                    "value": "IBMi_COR-74-07-2"
+                                    "displayname": "IBM i - IBMi_COR-74-08-1",
+                                    "value": "IBMi_COR-74-08-1"
                                 },
                                 {
                                     "displayname": "SAP - RHEL8-SP6-SAP",
@@ -678,7 +682,12 @@
                             "custom_config": {}
                         },
                         {
-                            "key": "custom_profile"
+                            "key": "custom_profile",
+                            "custom_config": {
+                                "grouping": "deployment",
+                                "original_grouping": "deployment",
+                                "type": "json_editor"
+                            }
                         },
                         {
                             "key": "configure_dns_forwarder"

modules/powervs-vpc-landing-zone/main.tf

@@ -4,7 +4,7 @@
 
 module "landing_zone" {
   source    = "terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module"
-  version   = "4.15.0"
+  version   = "5.3.1"
   providers = { ibm = ibm.ibm-is }
 
   ssh_public_key       = var.ssh_public_key

reference-architectures/extension/deploy-arch-ibm-pvs-inf-extension.md

@@ -11,7 +11,7 @@ authors:
   - name: Arnold Beilmann
   - name: Suraj Bharadwaj
 
-version: v3.2.0
+version: v4.0.0
 
 production: true
 
@@ -47,7 +47,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance="SAPCertified"}
-{: toc-version="3.2.0"}
+{: toc-version="4.0.0"}
 
 The Power Virtual Server with VPC landing zone as variation 'Extend Power Virtual Server with VPC landing zone' creates an additional Power Virtual Server workspace and connects it with already created Power Virtual Server with VPC landing zone. It builds on existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'.
 

reference-architectures/full-stack/deploy-arch-ibm-pvs-inf-full-stack.md

@@ -11,7 +11,7 @@ authors:
   - name: Arnold Beilmann
   - name: Suraj Bharadwaj
 
-version: v3.2.0
+version: v4.0.0
 
 # Whether the reference architecture is published to Cloud Docs production.
 # When set to false, the file is available only in staging. Default is false.
@@ -49,7 +49,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance="SAPCertified"}
-{: toc-version="3.2.0"}
+{: toc-version="4.0.0"}
 
 PowerVS workspace deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them.
 

reference-architectures/quickstart/deploy-arch-ibm-pvs-inf-quickstart.md

@@ -11,7 +11,7 @@ authors:
   - name: Arnold Beilmann
   - name: Stafania Saju
 
-version: v3.2.0
+version: v4.0.0
 
 # Whether the reference architecture is published to Cloud Docs production.
 # When set to false, the file is available only in staging. Default is false.
@@ -46,7 +46,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance=""}
-{: toc-version="3.2.0"}
+{: toc-version="4.0.0"}
 
 Quickstart deployment of the Power Virtual Server with VPC landing zone creates VPC services , a Power Virtual Server workspace and interconnects them. It also deploys a Power Virtual Server of chosen T-shirt size or custom configuration. Supported Os are Aix, IBM i and Linux images.
 

solutions/extension/README.md

@@ -39,7 +39,7 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 1.6 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.58.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.60.0 |
 
 ### Modules
 
@@ -51,8 +51,8 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
 
 | Name | Type |
 |------|------|
-| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.58.1/docs/data-sources/schematics_output) | data source |
-| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.58.1/docs/data-sources/schematics_workspace) | data source |
+| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.60.0/docs/data-sources/schematics_output) | data source |
+| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.60.0/docs/data-sources/schematics_workspace) | data source |
 
 ### Inputs
 
@@ -62,7 +62,7 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
 | <a name="input_cloud_connection"></a> [cloud\_connection](#input\_cloud\_connection) | Cloud connection configuration: speed (50, 100, 200, 500, 1000, 2000, 5000, 10000 Mb/s), count (1 or 2 connections), global\_routing (true or false), metered (true or false). Not applicable for dal10 DC where PER is enabled. | <pre>object({<br>    count          = number<br>    speed          = number<br>    global_routing = bool<br>    metered        = bool<br>  })</pre> | <pre>{<br>  "count": 2,<br>  "global_routing": true,<br>  "metered": true,<br>  "speed": 5000<br>}</pre> | no |
 | <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_powervs_backup_network"></a> [powervs\_backup\_network](#input\_powervs\_backup\_network) | Name of the IBM Cloud PowerVS backup network and CIDR to create. | <pre>object({<br>    name = string<br>    cidr = string<br>  })</pre> | <pre>{<br>  "cidr": "10.62.0.0/24",<br>  "name": "bkp_net"<br>}</pre> | no |
-| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md) | `list(string)` | <pre>[<br>  "IBMi-75-01-2924-2",<br>  "IBMi-75-01-2984-2",<br>  "7300-01-01",<br>  "7300-00-01",<br>  "SLES15-SP4-SAP",<br>  "SLES15-SP4-SAP-NETWEAVER",<br>  "RHEL8-SP6-SAP",<br>  "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
+| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md) | `list(string)` | <pre>[<br>  "IBMi-75-02-2924-1",<br>  "IBMi-75-02-2984-1",<br>  "7300-01-02",<br>  "7200-05-06",<br>  "SLES15-SP4-SAP",<br>  "SLES15-SP4-SAP-NETWEAVER",<br>  "RHEL8-SP6-SAP",<br>  "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
 | <a name="input_powervs_management_network"></a> [powervs\_management\_network](#input\_powervs\_management\_network) | Name of the IBM Cloud PowerVS management subnet and CIDR to create. | <pre>object({<br>    name = string<br>    cidr = string<br>  })</pre> | <pre>{<br>  "cidr": "10.61.0.0/24",<br>  "name": "mgmt_net"<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 |
 | <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 |

solutions/extension/variables.tf

@@ -69,7 +69,7 @@ variable "cloud_connection" {
 variable "powervs_image_names" {
   description = "List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md)"
   type        = list(string)
-  default     = ["IBMi-75-01-2924-2", "IBMi-75-01-2984-2", "7300-01-01", "7300-00-01", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
+  default     = ["IBMi-75-02-2924-1", "IBMi-75-02-2984-1", "7300-01-02", "7200-05-06", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
 }
 
 variable "tags" {

solutions/extension/versions.tf

@@ -7,7 +7,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "=1.58.1"
+      version = "=1.60.0"
     }
   }
 }

solutions/full-stack/README.md

@@ -36,7 +36,7 @@ This example sets up the following infrastructure:
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 1.6 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.58.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.60.0 |
 
 ### Modules
 
@@ -63,7 +63,7 @@ No resources.
 | <a name="input_landing_zone_configuration"></a> [landing\_zone\_configuration](#input\_landing\_zone\_configuration) | VPC landing zone configuration. | `string` | n/a | yes |
 | <a name="input_nfs_server_config"></a> [nfs\_server\_config](#input\_nfs\_server\_config) | Configuration for the NFS server. 'size' is in GB, 'mount\_path' defines the mount point on os. Set 'configure\_nfs\_server' to false to ignore creating volume. | <pre>object({<br>    size       = number<br>    mount_path = string<br>  })</pre> | <pre>{<br>  "mount_path": "/nfs",<br>  "size": 1000<br>}</pre> | no |
 | <a name="input_powervs_backup_network"></a> [powervs\_backup\_network](#input\_powervs\_backup\_network) | Name of the IBM Cloud PowerVS backup network and CIDR to create. | <pre>object({<br>    name = string<br>    cidr = string<br>  })</pre> | <pre>{<br>  "cidr": "10.52.0.0/24",<br>  "name": "bkp_net"<br>}</pre> | no |
-| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md) | `list(string)` | <pre>[<br>  "IBMi-75-01-2924-2",<br>  "IBMi-75-01-2984-2",<br>  "7300-01-01",<br>  "7300-00-01",<br>  "SLES15-SP4-SAP",<br>  "SLES15-SP4-SAP-NETWEAVER",<br>  "RHEL8-SP6-SAP",<br>  "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
+| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md) | `list(string)` | <pre>[<br>  "IBMi-75-02-2924-1",<br>  "IBMi-75-02-2984-1",<br>  "7300-01-02",<br>  "7200-05-06",<br>  "SLES15-SP4-SAP",<br>  "SLES15-SP4-SAP-NETWEAVER",<br>  "RHEL8-SP6-SAP",<br>  "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
 | <a name="input_powervs_management_network"></a> [powervs\_management\_network](#input\_powervs\_management\_network) | Name of the IBM Cloud PowerVS management subnet and CIDR to create. | <pre>object({<br>    name = string<br>    cidr = string<br>  })</pre> | <pre>{<br>  "cidr": "10.51.0.0/24",<br>  "name": "mgmt_net"<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 |
 | <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 |

solutions/full-stack/variables.tf

@@ -142,7 +142,7 @@ variable "cloud_connection" {
 variable "powervs_image_names" {
   description = "List of Images to be imported into cloud account from catalog images. Supported values can be found [here](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/solutions/full-stack/docs/catalog_image_names.md)"
   type        = list(string)
-  default     = ["IBMi-75-01-2924-2", "IBMi-75-01-2984-2", "7300-01-01", "7300-00-01", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
+  default     = ["IBMi-75-02-2924-1", "IBMi-75-02-2984-1", "7300-01-02", "7200-05-06", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
 }
 
 variable "tags" {