Skip to content

Commit d6e6bb8

Browse files
fix: override default images to import , fix quickstart for latest images (#809)
1 parent 5be73d0 commit d6e6bb8

File tree

13 files changed

+32
-32
lines changed

13 files changed

+32
-32
lines changed

ibm_catalog.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -567,19 +567,19 @@
567567
"value": "custom"
568568
},
569569
{
570-
"displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-01-02)",
570+
"displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-01-01)",
571571
"value": "aix_xs"
572572
},
573573
{
574-
"displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-01-02)",
574+
"displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-01-01)",
575575
"value": "aix_s"
576576
},
577577
{
578-
"displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-01-02)",
578+
"displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-01-01)",
579579
"value": "aix_m"
580580
},
581581
{
582-
"displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-01-02)",
582+
"displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-01-01)",
583583
"value": "aix_l"
584584
},
585585
{
@@ -666,12 +666,12 @@
666666
"value": "none"
667667
},
668668
{
669-
"displayname": "AIX - 7300-01-02",
670-
"value": "7300-01-02"
669+
"displayname": "AIX - 7300-01-01",
670+
"value": "7300-01-01"
671671
},
672672
{
673-
"displayname": "AIX - 7200-05-06",
674-
"value": "7200-05-06"
673+
"displayname": "AIX - 7200-05-07",
674+
"value": "7200-05-07"
675675
},
676676
{
677677
"displayname": "AIX - 7100-05-09",
@@ -686,12 +686,12 @@
686686
"value": "IBMi-75-03-2984-1"
687687
},
688688
{
689-
"displayname": "IBM i - IBMi-74-08-2984-1",
690-
"value": "IBMi-74-08-2984-1"
689+
"displayname": "IBM i - IBMi-74-09-2984-1",
690+
"value": "IBMi-74-09-2984-1"
691691
},
692692
{
693-
"displayname": "IBM i - IBMi_COR-74-08-1",
694-
"value": "IBMi_COR-74-08-1"
693+
"displayname": "IBM i - IBMi_COR-74-09-1",
694+
"value": "IBMi_COR-74-09-1"
695695
},
696696
{
697697
"displayname": "SAP - RHEL8-SP6-SAP",

modules/powervs-vpc-landing-zone/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
116116
| <a name="input_landing_zone_configuration"></a> [landing\_zone\_configuration](#input\_landing\_zone\_configuration) | VPC landing zone configuration. Provided value must be one of ['3VPC\_RHEL', '3VPC\_SLES', '1VPC\_RHEL'] only. | `string` | n/a | yes |
117117
| <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 |
118118
| <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 |
119-
| <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 |
119+
| <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-03-2924-1",<br> "IBMi-74-09-2984-1",<br> "7300-00-01",<br> "7200-05-07",<br> "SLES15-SP4-SAP",<br> "SLES15-SP4-SAP-NETWEAVER",<br> "RHEL8-SP6-SAP",<br> "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
120120
| <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 |
121121
| <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 |
122122
| <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 |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ variable "cloud_connection" {
139139
variable "powervs_image_names" {
140140
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)"
141141
type = list(string)
142-
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"]
142+
default = ["IBMi-75-03-2924-1", "IBMi-74-09-2984-1", "7300-00-01", "7200-05-07", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
143143
}
144144

145145
variable "tags" {

solutions/extension/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
3939
| Name | Version |
4040
|------|---------|
4141
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 1.7 |
42-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.63.0 |
42+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.64.1 |
4343

4444
### Modules
4545

@@ -51,8 +51,8 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
5151

5252
| Name | Type |
5353
|------|------|
54-
| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.63.0/docs/data-sources/schematics_output) | data source |
55-
| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.63.0/docs/data-sources/schematics_workspace) | data source |
54+
| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.64.1/docs/data-sources/schematics_output) | data source |
55+
| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.64.1/docs/data-sources/schematics_workspace) | data source |
5656

5757
### Inputs
5858

@@ -62,7 +62,7 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
6262
| <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 DCs 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 |
6363
| <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 |
6464
| <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 |
65-
| <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-03-2924-1",<br> "IBMi-75-03-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 |
65+
| <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-03-2924-1",<br> "IBMi-74-09-2984-1",<br> "7300-00-01",<br> "7200-05-07",<br> "SLES15-SP4-SAP",<br> "SLES15-SP4-SAP-NETWEAVER",<br> "RHEL8-SP6-SAP",<br> "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
6666
| <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 |
6767
| <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 |
6868
| <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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ variable "cloud_connection" {
6969
variable "powervs_image_names" {
7070
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)"
7171
type = list(string)
72-
default = ["IBMi-75-03-2924-1", "IBMi-75-03-2984-1", "7300-01-02", "7200-05-06", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
72+
default = ["IBMi-75-03-2924-1", "IBMi-74-09-2984-1", "7300-00-01", "7200-05-07", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
7373
}
7474

7575
variable "tags" {

solutions/extension/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
required_providers {
88
ibm = {
99
source = "IBM-Cloud/ibm"
10-
version = "=1.63.0"
10+
version = "=1.64.1"
1111
}
1212
}
1313
}

solutions/full-stack/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This example sets up the following infrastructure:
3535
| Name | Version |
3636
|------|---------|
3737
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 1.7 |
38-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.63.0 |
38+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.64.1 |
3939

4040
### Modules
4141

@@ -62,7 +62,7 @@ No resources.
6262
| <a name="input_landing_zone_configuration"></a> [landing\_zone\_configuration](#input\_landing\_zone\_configuration) | VPC landing zone configuration. | `string` | n/a | yes |
6363
| <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 |
6464
| <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 |
65-
| <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-03-2924-1",<br> "IBMi-75-03-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 |
65+
| <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-03-2924-1",<br> "IBMi-74-09-2984-1",<br> "7300-00-01",<br> "7200-05-07",<br> "SLES15-SP4-SAP",<br> "SLES15-SP4-SAP-NETWEAVER",<br> "RHEL8-SP6-SAP",<br> "RHEL8-SP6-SAP-NETWEAVER"<br>]</pre> | no |
6666
| <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 |
6767
| <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 |
6868
| <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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ variable "cloud_connection" {
142142
variable "powervs_image_names" {
143143
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)"
144144
type = list(string)
145-
default = ["IBMi-75-03-2924-1", "IBMi-75-03-2984-1", "7300-01-02", "7200-05-06", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
145+
default = ["IBMi-75-03-2924-1", "IBMi-74-09-2984-1", "7300-00-01", "7200-05-07", "SLES15-SP4-SAP", "SLES15-SP4-SAP-NETWEAVER", "RHEL8-SP6-SAP", "RHEL8-SP6-SAP-NETWEAVER"]
146146
}
147147

148148
variable "tags" {

solutions/full-stack/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
required_providers {
88
ibm = {
99
source = "IBM-Cloud/ibm"
10-
version = "=1.63.0"
10+
version = "=1.64.1"
1111
}
1212
}
1313
}

solutions/quickstart/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This example sets up the following infrastructure:
3535
| Name | Version |
3636
|------|---------|
3737
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 1.7 |
38-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.63.0 |
38+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.64.1 |
3939

4040
### Modules
4141

0 commit comments

Comments
 (0)