Skip to content

Commit 3efb2c9

Browse files
terraform-ibm-modules-opssurajsbharadwajstafaniasaju
authored
feat: switch dal12 DC to PER DC
--------- Co-authored-by: surajsbharadwaj <[email protected]> Co-authored-by: stafaniasaju <[email protected]>
1 parent 7b4e545 commit 3efb2c9

File tree

12 files changed

+232
-41
lines changed

12 files changed

+232
-41
lines changed

ibm_catalog.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"value": "dal10"
8686
},
8787
{
88-
"displayname": "Dallas 12 (dal12)",
88+
"displayname": "Dallas 12 (dal12) PER",
8989
"value": "dal12"
9090
},
9191
{
@@ -485,7 +485,7 @@
485485
"value": "dal10"
486486
},
487487
{
488-
"displayname": "Dallas 12 (dal12)",
488+
"displayname": "Dallas 12 (dal12) PER",
489489
"value": "dal12"
490490
},
491491
{
@@ -994,7 +994,7 @@
994994
"value": "dal10"
995995
},
996996
{
997-
"displayname": "Dallas 12 (dal12)",
997+
"displayname": "Dallas 12 (dal12) PER",
998998
"value": "dal12"
999999
},
10001000
{
@@ -1325,7 +1325,7 @@
13251325
"value": "dal10"
13261326
},
13271327
{
1328-
"displayname": "Dallas 12 (dal12)",
1328+
"displayname": "Dallas 12 (dal12) PER",
13291329
"value": "dal12"
13301330
},
13311331
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
9292

9393
| Name | Source | Version |
9494
|------|--------|---------|
95-
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 5.7.1 |
95+
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 5.13.1 |
9696
| <a name="module_landing_zone_configure_network_services"></a> [landing\_zone\_configure\_network\_services](#module\_landing\_zone\_configure\_network\_services) | ../ansible-configure-network-services | n/a |
9797
| <a name="module_landing_zone_configure_proxy_server"></a> [landing\_zone\_configure\_proxy\_server](#module\_landing\_zone\_configure\_proxy\_server) | ../ansible-configure-network-services | n/a |
98-
| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-workspace/ibm | 1.5.0 |
98+
| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-workspace/ibm | 1.6.0 |
9999

100100
### Resources
101101

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
module "landing_zone" {
66
source = "terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module"
7-
version = "5.7.1"
7+
version = "5.13.1"
88
providers = { ibm = ibm.ibm-is }
99

1010
ssh_public_key = var.ssh_public_key
@@ -48,7 +48,7 @@ module "landing_zone_configure_network_services" {
4848

4949
module "powervs_infra" {
5050
source = "terraform-ibm-modules/powervs-workspace/ibm"
51-
version = "1.5.0"
51+
version = "1.6.0"
5252
providers = { ibm = ibm.ibm-pi }
5353

5454
pi_zone = var.powervs_zone

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-01-17"
4+
lastupdated: "2024-02-01"
55

66
keywords:
77

@@ -11,7 +11,7 @@ authors:
1111
- name: Arnold Beilmann
1212
- name: Suraj Bharadwaj
1313

14-
version: v4.3.0
14+
version: v4.4.0
1515

1616
production: true
1717

@@ -39,7 +39,7 @@ content-type: reference-architecture
3939
{: toc-industry="Technology"}
4040
{: toc-use-case="ITServiceManagement"}
4141
{: toc-compliance="SAPCertified"}
42-
{: toc-version="4.3.0"}
42+
{: toc-version="4.4.0"}
4343

4444
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 the already created Power Virtual Server with VPC landing zone. It builds on the existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'.
4545

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-01-17"
4+
lastupdated: "2024-02-01"
55

66
keywords:
77

@@ -11,7 +11,7 @@ authors:
1111
- name: Arnold Beilmann
1212
- name: Suraj Bharadwaj
1313

14-
version: v4.3.0
14+
version: v4.4.0
1515

1616
# Whether the reference architecture is published to Cloud Docs production.
1717
# When set to false, the file is available only in staging. Default is false.
@@ -41,7 +41,7 @@ content-type: reference-architecture
4141
{: toc-industry="Technology"}
4242
{: toc-use-case="ITServiceManagement"}
4343
{: toc-compliance="SAPCertified"}
44-
{: toc-version="4.3.0"}
44+
{: toc-version="4.4.0"}
4545

4646
The PowerVS workspace deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them.
4747

reference-architectures/import-workspace/deploy-arch-ibm-pvs-inf-import-workspace.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-01-17"
4+
lastupdated: "2024-02-01"
55

66
keywords:
77

@@ -11,7 +11,7 @@ authors:
1111
- name: Arnold Beilmann
1212
- name: Stafania Saju
1313

14-
version: v4.3.0
14+
version: v4.4.0
1515

1616
production: true
1717

@@ -38,7 +38,7 @@ content-type: reference-architecture
3838
{: toc-industry="Technology"}
3939
{: toc-use-case="ITServiceManagement"}
4040
{: toc-compliance="SAPCertified"}
41-
{: toc-version="4.3.0"}
41+
{: toc-version="4.4.0"}
4242

4343
This solution helps to install the deployable architecture ['Power Virtual Server for SAP HANA'](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-pvs-sap-9aa6135e-75d5-467e-9f4a-ac2a21c069b8-global) on top of a pre-existing Power Virtual Server(PowerVS) landscape. 'Power Virtual Server for SAP HANA' automation requires a schematics workspace id for installation. The 'import-workspace' solution creates a schematics workspace by taking pre-existing VPC and PowerVS infrastructure resource details as inputs. The ID of this schematics workspace will be the pre-requisite workspace id required by 'Power Virtual Server for SAP HANA' to create and configure the PowerVS instances for SAP on top of the existing infrastructure.
4444

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-01-17"
4+
lastupdated: "2024-02-01"
55

66
keywords:
77

@@ -11,7 +11,7 @@ authors:
1111
- name: Arnold Beilmann
1212
- name: Stafania Saju
1313

14-
version: v4.3.0
14+
version: v4.4.0
1515

1616
# Whether the reference architecture is published to Cloud Docs production.
1717
# When set to false, the file is available only in staging. Default is false.
@@ -41,7 +41,7 @@ content-type: reference-architecture
4141
{: toc-industry="Technology"}
4242
{: toc-use-case="ITServiceManagement"}
4343
{: toc-compliance=""}
44-
{: toc-version="4.3.0"}
44+
{: toc-version="4.4.0"}
4545

4646
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.
4747

solutions/extension/README.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,68 @@ If you do not have a PowerVS infrastructure that is the [full stack solution](ht
3232

3333
## Architecture diagram
3434
![extension-variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/reference-architectures/extension/deploy-arch-ibm-pvs-inf-extension.svg)
35+
36+
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
37+
### Requirements
38+
39+
| Name | Version |
40+
|------|---------|
41+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 1.6 |
42+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.61.0 |
43+
44+
### Modules
45+
46+
| Name | Source | Version |
47+
|------|--------|---------|
48+
| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-workspace/ibm | 1.6.0 |
49+
50+
### Resources
51+
52+
| Name | Type |
53+
|------|------|
54+
| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.61.0/docs/data-sources/schematics_output) | data source |
55+
| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.61.0/docs/data-sources/schematics_workspace) | data source |
56+
57+
### Inputs
58+
59+
| Name | Description | Type | Default | Required |
60+
|------|-------------|------|---------|:--------:|
61+
| <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 |
62+
| <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 |
63+
| <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 |
64+
| <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-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 |
66+
| <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 |
67+
| <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 |
68+
| <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 |
69+
| <a name="input_prerequisite_workspace_id"></a> [prerequisite\_workspace\_id](#input\_prerequisite\_workspace\_id) | IBM Cloud Schematics workspace ID of the prerequisite infrastructure. If you do not have an existing deployment yet, create a new architecture using the same catalog tile. | `string` | n/a | yes |
70+
| <a name="input_tags"></a> [tags](#input\_tags) | List of tag names for the IBM Cloud PowerVS workspace | `list(string)` | `[]` | no |
71+
72+
### Outputs
73+
74+
| Name | Description |
75+
|------|-------------|
76+
| <a name="output_access_host_or_ip"></a> [access\_host\_or\_ip](#output\_access\_host\_or\_ip) | Access host for created PowerVS infrastructure. |
77+
| <a name="output_cloud_connection_count"></a> [cloud\_connection\_count](#output\_cloud\_connection\_count) | Number of cloud connections configured in created PowerVS infrastructure. |
78+
| <a name="output_dns_host_or_ip"></a> [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. |
79+
| <a name="output_nfs_host_or_ip_path"></a> [nfs\_host\_or\_ip\_path](#output\_nfs\_host\_or\_ip\_path) | NFS host for created PowerVS infrastructure. |
80+
| <a name="output_ntp_host_or_ip"></a> [ntp\_host\_or\_ip](#output\_ntp\_host\_or\_ip) | NTP host for created PowerVS infrastructure. |
81+
| <a name="output_powervs_backup_subnet"></a> [powervs\_backup\_subnet](#output\_powervs\_backup\_subnet) | Name, ID and CIDR of backup private network in created PowerVS infrastructure. |
82+
| <a name="output_powervs_images"></a> [powervs\_images](#output\_powervs\_images) | Object containing imported PowerVS image names and image ids. |
83+
| <a name="output_powervs_management_subnet"></a> [powervs\_management\_subnet](#output\_powervs\_management\_subnet) | Name, ID and CIDR of management private network in created PowerVS infrastructure. |
84+
| <a name="output_powervs_resource_group_name"></a> [powervs\_resource\_group\_name](#output\_powervs\_resource\_group\_name) | IBM Cloud resource group where PowerVS infrastructure is created. |
85+
| <a name="output_powervs_ssh_public_key"></a> [powervs\_ssh\_public\_key](#output\_powervs\_ssh\_public\_key) | SSH public key name and value in created PowerVS infrastructure. |
86+
| <a name="output_powervs_workspace_guid"></a> [powervs\_workspace\_guid](#output\_powervs\_workspace\_guid) | PowerVS infrastructure workspace guid. The GUID of the resource instance. |
87+
| <a name="output_powervs_workspace_id"></a> [powervs\_workspace\_id](#output\_powervs\_workspace\_id) | PowerVS infrastructure workspace id. The unique identifier of the new resource instance. |
88+
| <a name="output_powervs_workspace_name"></a> [powervs\_workspace\_name](#output\_powervs\_workspace\_name) | PowerVS infrastructure workspace name. |
89+
| <a name="output_powervs_zone"></a> [powervs\_zone](#output\_powervs\_zone) | Zone where PowerVS infrastructure is created. |
90+
| <a name="output_prefix"></a> [prefix](#output\_prefix) | The prefix that is associated with all resources |
91+
| <a name="output_proxy_host_or_ip_port"></a> [proxy\_host\_or\_ip\_port](#output\_proxy\_host\_or\_ip\_port) | Proxy host:port for created PowerVS infrastructure. |
92+
| <a name="output_schematics_workspace_id"></a> [schematics\_workspace\_id](#output\_schematics\_workspace\_id) | ID of the IBM Cloud Schematics workspace. Returns null if not ran in Schematics |
93+
| <a name="output_ssh_public_key"></a> [ssh\_public\_key](#output\_ssh\_public\_key) | The string value of the ssh public key used when deploying VPC |
94+
| <a name="output_transit_gateway_id"></a> [transit\_gateway\_id](#output\_transit\_gateway\_id) | The ID of transit gateway. |
95+
| <a name="output_transit_gateway_name"></a> [transit\_gateway\_name](#output\_transit\_gateway\_name) | The name of the transit gateway. |
96+
| <a name="output_vpc_names"></a> [vpc\_names](#output\_vpc\_names) | A list of the names of the VPC. |
97+
| <a name="output_vsi_list"></a> [vsi\_list](#output\_vsi\_list) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. |
98+
| <a name="output_vsi_names"></a> [vsi\_names](#output\_vsi\_names) | A list of the vsis names provisioned within the VPCs. |
99+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

solutions/extension/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "powervs_infra" {
22
source = "terraform-ibm-modules/powervs-workspace/ibm"
3-
version = "1.5.0"
3+
version = "1.6.0"
44

55
pi_zone = var.powervs_zone
66
pi_resource_group_name = var.powervs_resource_group_name

0 commit comments

Comments
 (0)