Skip to content

Commit d30d7e2

Browse files
surajsbharadwajsurajsbharadwaj
authored
fix: dynamic update of catalog images for qs via ibm_catalog json (#851)
1 parent 46ae13d commit d30d7e2

File tree

11 files changed

+86
-55
lines changed

11 files changed

+86
-55
lines changed

‎ibm_catalog.json‎

Lines changed: 51 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -601,53 +601,86 @@
601601
},
602602
{
603603
"key": "tshirt_size",
604-
"type": "string",
604+
"type": "object",
605605
"default_value": "",
606606
"required": true,
607607
"options": [
608608
{
609609
"displayname": "Custom (Configure in optional parameters)",
610-
"value": "custom"
610+
"value": {
611+
"tshirt_size": "custome",
612+
"image": ""
613+
}
611614
},
612615
{
613616
"displayname": "AIX - XS (1cpu,32GB,disk-100GB,7300-02-01)",
614-
"value": "aix_xs"
617+
"value": {
618+
"tshirt_size": "aix_xs",
619+
"image": "7300-02-01"
620+
}
615621
},
616622
{
617623
"displayname": "AIX - S (4cpu,128GB,disk-500GB,7300-02-01)",
618-
"value": "aix_s"
624+
"value": {
625+
"tshirt_size": "aix_s",
626+
"image": "7300-02-01"
627+
}
619628
},
620629
{
621630
"displayname": "AIX - M (8cpu,256GB,disk-1000GB,7300-02-01)",
622-
"value": "aix_m"
631+
"value": {
632+
"tshirt_size": "aix_m",
633+
"image": "7300-02-01"
634+
}
623635
},
624636
{
625637
"displayname": "AIX - L (14cpu,512GB,disk-2000GB,7300-02-01)",
626-
"value": "aix_l"
638+
"value": {
639+
"tshirt_size": "aix_l",
640+
"image": "7300-02-01"
641+
}
627642
},
628643
{
629-
"displayname": "IBM i - XS (0.25cpu,8GB,disk-100GB,IBMi-75-03-2924-1)",
630-
"value": "ibm_i_xs"
644+
"displayname": "IBM i - XS (0.25cpu,8GB,disk-100GB,IBMi-75-03-2924-2)",
645+
"value": {
646+
"tshirt_size": "ibm_i_xs",
647+
"image": "IBMi-75-03-2924-2"
648+
}
631649
},
632650
{
633-
"displayname": "IBM i - S (1cpu,32GB,disk-500GB,IBMi-75-03-2924-1)",
634-
"value": "ibm_i_s"
651+
"displayname": "IBM i - S (1cpu,32GB,disk-500GB,IBMi-75-03-2924-2)",
652+
"value": {
653+
"tshirt_size": "ibm_i_s",
654+
"image": "IBMi-75-03-2924-2"
655+
}
635656
},
636657
{
637-
"displayname": "IBM i - M (2cpu,64GB,disk-1000GB,IBMi-75-03-2924-1)",
638-
"value": "ibm_i_m"
658+
"displayname": "IBM i - M (2cpu,64GB,disk-1000GB,IBMi-75-03-2924-2)",
659+
"value": {
660+
"tshirt_size": "ibm_i_m",
661+
"image": "IBMi-75-03-2924-2"
662+
}
639663
},
640664
{
641-
"displayname": "IBM i - L (4cpu,132GB,disk-2000GB,IBMi-75-03-2924-1)",
642-
"value": "ibm_i_l"
665+
"displayname": "IBM i - L (4cpu,132GB,disk-2000GB,IBMi-75-03-2924-2)",
666+
"value": {
667+
"tshirt_size": "ibm_i_l",
668+
"image": "IBMi-75-03-2924-2"
669+
}
643670
},
644671
{
645672
"displayname": "SAP DEV RHEL (ush1-4x128,disk-750GB,RHEL9-SP2-SAP)",
646-
"value": "sap_dev_rhel"
673+
"value": {
674+
"tshirt_size": "sap_dev_rhel",
675+
"image": "RHEL9-SP2-SAP"
676+
}
647677
},
648678
{
649679
"displayname": "SAP DEV SLES (ush1-4x128,disk-750GB,SLES15-SP5-SAP)",
650-
"value": "sap_dev_sles"
680+
"value": {
681+
"tshirt_size": "sap_dev_sles",
682+
"image": "SLES15-SP5-SAP"
683+
}
651684
}
652685
],
653686
"custom_config": {}
@@ -725,12 +758,8 @@
725758
"value": "7200-05-07"
726759
},
727760
{
728-
"displayname": "AIX - 7100-05-09",
729-
"value": "7100-05-09"
730-
},
731-
{
732-
"displayname": "IBM i - IBMi-75-03-2924-1",
733-
"value": "IBMi-75-03-2924-1"
761+
"displayname": "IBM i - IBMi-75-03-2924-2",
762+
"value": "IBMi-75-03-2924-2"
734763
},
735764
{
736765
"displayname": "IBM i - IBMi-75-03-2984-1",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
131131
| <a name="input_external_access_ip"></a> [external\_access\_ip](#input\_external\_access\_ip) | Specify the source IP address or CIDR for login through SSH to the environment after deployment. Access to the environment will be allowed only from this IP address. Can be set to 'null' if you choose to use client to site vpn. | `string` | n/a | yes |
132132
| <a name="input_nfs_server_config"></a> [nfs\_server\_config](#input\_nfs\_server\_config) | Configuration for the NFS server. 'size' is in GB, 'iops' is maximum input/output operation performance bandwidth per second, 'mount\_path' defines the target mount point on os. Set 'configure\_nfs\_server' to false to ignore creating file storage share. | <pre>object({<br> size = number<br> iops = number<br> mount_path = string<br> })</pre> | <pre>{<br> "iops": 600,<br> "mount_path": "/nfs",<br> "size": 200<br>}</pre> | no |
133133
| <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 |
134-
| <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-workspace/blob/main/docs/catalog_images_list.md) | `list(string)` | <pre>[<br> "IBMi-75-03-2924-1",<br> "IBMi-74-09-2984-1",<br> "7200-05-07",<br> "7300-02-01",<br> "SLES15-SP5-SAP",<br> "SLES15-SP5-SAP-NETWEAVER",<br> "RHEL9-SP2-SAP",<br> "RHEL9-SP2-SAP-NETWEAVER"<br>]</pre> | no |
134+
| <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-workspace/blob/main/docs/catalog_images_list.md) | `list(string)` | <pre>[<br> "IBMi-75-03-2924-2",<br> "IBMi-74-09-2984-1",<br> "7200-05-07",<br> "7300-02-01",<br> "SLES15-SP5-SAP",<br> "SLES15-SP5-SAP-NETWEAVER",<br> "RHEL9-SP2-SAP",<br> "RHEL9-SP2-SAP-NETWEAVER"<br>]</pre> | no |
135135
| <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 |
136136
| <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 |
137137
| <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 |
138138
| <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. Prefixes must be 16 or fewer characters. | `string` | n/a | yes |
139139
| <a name="input_sm_service_plan"></a> [sm\_service\_plan](#input\_sm\_service\_plan) | The service/pricing plan to use when provisioning a new Secrets Manager instance. Allowed values: `standard` and `trial`. Only used if `existing_sm_instance_guid` is set to null. | `string` | `"standard"` | no |
140-
| <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 public SSH key referenced by 'ssh\_public\_key'. The key is not uploaded or stored. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys). | `string` | n/a | yes |
140+
| <a name="input_ssh_private_key"></a> [ssh\_private\_key](#input\_ssh\_private\_key) | Private SSH key (RSA format) to login to Intel VSIs to configure network management services (SQUID, NTP, DNS and ansible). Should match to public SSH key referenced by 'ssh\_public\_key'. The key is not uploaded or stored. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys). | `string` | n/a | yes |
141141
| <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 |
142142
| <a name="input_tags"></a> [tags](#input\_tags) | List of tag names for the IBM Cloud PowerVS workspace | `list(string)` | `[]` | no |
143143

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ variable "ssh_public_key" {
3939
}
4040

4141
variable "ssh_private_key" {
42-
description = "Private SSH key (RSA format) used to login to IBM PowerVS instances. Should match to public SSH key referenced by 'ssh_public_key'. The key is not uploaded or stored. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys)."
42+
description = "Private SSH key (RSA format) to login to Intel VSIs to configure network management services (SQUID, NTP, DNS and ansible). Should match to public SSH key referenced by 'ssh_public_key'. The key is not uploaded or stored. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys)."
4343
type = string
4444
sensitive = true
4545
}
@@ -130,7 +130,7 @@ variable "powervs_backup_network" {
130130
variable "powervs_image_names" {
131131
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-workspace/blob/main/docs/catalog_images_list.md)"
132132
type = list(string)
133-
default = ["IBMi-75-03-2924-1", "IBMi-74-09-2984-1", "7200-05-07", "7300-02-01", "SLES15-SP5-SAP", "SLES15-SP5-SAP-NETWEAVER", "RHEL9-SP2-SAP", "RHEL9-SP2-SAP-NETWEAVER"]
133+
default = ["IBMi-75-03-2924-2", "IBMi-74-09-2984-1", "7200-05-07", "7300-02-01", "SLES15-SP5-SAP", "SLES15-SP5-SAP-NETWEAVER", "RHEL9-SP2-SAP", "RHEL9-SP2-SAP-NETWEAVER"]
134134
}
135135

136136
variable "tags" {

‎solutions/extension/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
6262
| <a name="input_IC_SCHEMATICS_WORKSPACE_ID"></a> [IC\_SCHEMATICS\_WORKSPACE\_ID](#input\_IC\_SCHEMATICS\_WORKSPACE\_ID) | leave blank if running locally. This variable will be automatically populated if running from an IBM Cloud Schematics workspace | `string` | `""` | 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-workspace/blob/main/docs/catalog_images_list.md) | `list(string)` | <pre>[<br> "IBMi-75-03-2924-1",<br> "IBMi-74-09-2984-1",<br> "7200-05-07",<br> "7300-02-01",<br> "SLES15-SP5-SAP",<br> "SLES15-SP5-SAP-NETWEAVER",<br> "RHEL9-SP2-SAP",<br> "RHEL9-SP2-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-workspace/blob/main/docs/catalog_images_list.md) | `list(string)` | <pre>[<br> "IBMi-75-03-2924-2",<br> "IBMi-74-09-2984-1",<br> "7200-05-07",<br> "7300-02-01",<br> "SLES15-SP5-SAP",<br> "SLES15-SP5-SAP-NETWEAVER",<br> "RHEL9-SP2-SAP",<br> "RHEL9-SP2-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
@@ -52,7 +52,7 @@ variable "ibmcloud_api_key" {
5252
variable "powervs_image_names" {
5353
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-workspace/blob/main/docs/catalog_images_list.md)"
5454
type = list(string)
55-
default = ["IBMi-75-03-2924-1", "IBMi-74-09-2984-1", "7200-05-07", "7300-02-01", "SLES15-SP5-SAP", "SLES15-SP5-SAP-NETWEAVER", "RHEL9-SP2-SAP", "RHEL9-SP2-SAP-NETWEAVER"]
55+
default = ["IBMi-75-03-2924-2", "IBMi-74-09-2984-1", "7200-05-07", "7300-02-01", "SLES15-SP5-SAP", "SLES15-SP5-SAP-NETWEAVER", "RHEL9-SP2-SAP", "RHEL9-SP2-SAP-NETWEAVER"]
5656
}
5757

5858
variable "tags" {

0 commit comments

Comments
 (0)