Skip to content

Commit a60ca28

Browse files
terraform-ibm-modules-opsstafaniasaju
terraform-ibm-modules-ops
and
stafaniasaju
authored
fix: update terraform-module (#989)
* chore(deps): update terraform-module * fix: include tags for resources SKIP UPGRADE TEST: tags are now supported for instance and workspace elements * fix: include tags for resources SKIP UPGRADE TEST: tags are now supported for instance and workspace elements * fix: update power vsi image list SKIP UPGRADE TEST: custom_profile_instance_boot_image list update for quickstart --------- Co-authored-by: stafaniasaju <stafania.saju@ibm.com>
1 parent a6b0dc2 commit a60ca28

File tree

11 files changed

+60
-124
lines changed

11 files changed

+60
-124
lines changed

‎ibm_catalog.json

Lines changed: 37 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -430,33 +430,23 @@
430430
],
431431
"iam_permissions": [
432432
{
433-
"role_crns": [
434-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
435-
],
433+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
436434
"service_name": "appid"
437435
},
438436
{
439-
"role_crns": [
440-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
441-
],
437+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
442438
"service_name": "cloud-object-storage"
443439
},
444440
{
445-
"role_crns": [
446-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
447-
],
441+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
448442
"service_name": "hs-crypto"
449443
},
450444
{
451-
"role_crns": [
452-
"crn:v1:bluemix:public:iam::::role:Administrator"
453-
],
445+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Administrator"],
454446
"service_name": "iam-identity"
455447
},
456448
{
457-
"role_crns": [
458-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
459-
],
449+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
460450
"service_name": "kms"
461451
},
462452
{
@@ -467,27 +457,19 @@
467457
"service_name": "is.vpc"
468458
},
469459
{
470-
"role_crns": [
471-
"crn:v1:bluemix:public:iam::::role:Editor"
472-
],
460+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
473461
"service_name": "is.vpc"
474462
},
475463
{
476-
"role_crns": [
477-
"crn:v1:bluemix:public:iam::::role:Editor"
478-
],
464+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
479465
"service_name": "transit.gateway"
480466
},
481467
{
482-
"role_crns": [
483-
"crn:v1:bluemix:public:iam::::role:Editor"
484-
],
468+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
485469
"service_name": "directlink.connect"
486470
},
487471
{
488-
"role_crns": [
489-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
490-
],
472+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
491473
"service_name": "power-iaas"
492474
}
493475
],
@@ -806,24 +788,24 @@
806788
"value": "IBMi-75-04-2984-1"
807789
},
808790
{
809-
"displayname": "IBM i - IBMi-75-03-2984-1",
810-
"value": "IBMi-75-03-2984-1"
791+
"displayname": "IBM i - IBMi-75-04-2924-1",
792+
"value": "IBMi-75-04-2924-1"
811793
},
812794
{
813795
"displayname": "IBM i - IBMi-74-10-2984-1",
814796
"value": "IBMi-74-10-2984-1"
815797
},
816798
{
817-
"displayname": "IBM i - IBMi_COR-74-09-1",
818-
"value": "IBMi_COR-74-09-1"
799+
"displayname": "IBM i - IBMi_COR-74-10-1",
800+
"value": "IBMi_COR-74-10-1"
819801
},
820802
{
821803
"displayname": "Linux - RHEL9-SP2",
822804
"value": "RHEL9-SP2"
823805
},
824806
{
825807
"displayname": "Linux - RHEL8-SP8",
826-
"value": "RHEL8-SP28"
808+
"value": "RHEL8-SP8"
827809
},
828810
{
829811
"displayname": "Linux - SLES15-SP5",
@@ -1058,33 +1040,23 @@
10581040
],
10591041
"iam_permissions": [
10601042
{
1061-
"role_crns": [
1062-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1063-
],
1043+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
10641044
"service_name": "appid"
10651045
},
10661046
{
1067-
"role_crns": [
1068-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1069-
],
1047+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
10701048
"service_name": "cloud-object-storage"
10711049
},
10721050
{
1073-
"role_crns": [
1074-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1075-
],
1051+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
10761052
"service_name": "hs-crypto"
10771053
},
10781054
{
1079-
"role_crns": [
1080-
"crn:v1:bluemix:public:iam::::role:Administrator"
1081-
],
1055+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Administrator"],
10821056
"service_name": "iam-identity"
10831057
},
10841058
{
1085-
"role_crns": [
1086-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1087-
],
1059+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
10881060
"service_name": "kms"
10891061
},
10901062
{
@@ -1095,27 +1067,19 @@
10951067
"service_name": "is.vpc"
10961068
},
10971069
{
1098-
"role_crns": [
1099-
"crn:v1:bluemix:public:iam::::role:Editor"
1100-
],
1070+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
11011071
"service_name": "is.vpc"
11021072
},
11031073
{
1104-
"role_crns": [
1105-
"crn:v1:bluemix:public:iam::::role:Editor"
1106-
],
1074+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
11071075
"service_name": "transit.gateway"
11081076
},
11091077
{
1110-
"role_crns": [
1111-
"crn:v1:bluemix:public:iam::::role:Editor"
1112-
],
1078+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
11131079
"service_name": "directlink.connect"
11141080
},
11151081
{
1116-
"role_crns": [
1117-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1118-
],
1082+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
11191083
"service_name": "power-iaas"
11201084
}
11211085
],
@@ -1395,33 +1359,23 @@
13951359
],
13961360
"iam_permissions": [
13971361
{
1398-
"role_crns": [
1399-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1400-
],
1362+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
14011363
"service_name": "appid"
14021364
},
14031365
{
1404-
"role_crns": [
1405-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1406-
],
1366+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
14071367
"service_name": "cloud-object-storage"
14081368
},
14091369
{
1410-
"role_crns": [
1411-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1412-
],
1370+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
14131371
"service_name": "hs-crypto"
14141372
},
14151373
{
1416-
"role_crns": [
1417-
"crn:v1:bluemix:public:iam::::role:Administrator"
1418-
],
1374+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Administrator"],
14191375
"service_name": "iam-identity"
14201376
},
14211377
{
1422-
"role_crns": [
1423-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1424-
],
1378+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
14251379
"service_name": "kms"
14261380
},
14271381
{
@@ -1432,27 +1386,19 @@
14321386
"service_name": "is.vpc"
14331387
},
14341388
{
1435-
"role_crns": [
1436-
"crn:v1:bluemix:public:iam::::role:Editor"
1437-
],
1389+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
14381390
"service_name": "is.vpc"
14391391
},
14401392
{
1441-
"role_crns": [
1442-
"crn:v1:bluemix:public:iam::::role:Editor"
1443-
],
1393+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
14441394
"service_name": "transit.gateway"
14451395
},
14461396
{
1447-
"role_crns": [
1448-
"crn:v1:bluemix:public:iam::::role:Editor"
1449-
],
1397+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
14501398
"service_name": "directlink.connect"
14511399
},
14521400
{
1453-
"role_crns": [
1454-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1455-
],
1401+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
14561402
"service_name": "power-iaas"
14571403
}
14581404
],
@@ -1500,10 +1446,7 @@
15001446
"compliance": {},
15011447
"dependencies": [
15021448
{
1503-
"flavors": [
1504-
"standard",
1505-
"standard-plus-vsi"
1506-
],
1449+
"flavors": ["standard", "standard-plus-vsi"],
15071450
"install_type": "fullstack",
15081451
"catalogID": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc",
15091452
"id": "2dd486c7-b317-4aaa-907b-42671485ad96-global",
@@ -1762,27 +1705,19 @@
17621705
],
17631706
"iam_permissions": [
17641707
{
1765-
"role_crns": [
1766-
"crn:v1:bluemix:public:iam::::role:Editor"
1767-
],
1708+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
17681709
"service_name": "is.vpc"
17691710
},
17701711
{
1771-
"role_crns": [
1772-
"crn:v1:bluemix:public:iam::::role:Editor"
1773-
],
1712+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
17741713
"service_name": "transit.gateway"
17751714
},
17761715
{
1777-
"role_crns": [
1778-
"crn:v1:bluemix:public:iam::::role:Editor"
1779-
],
1716+
"role_crns": ["crn:v1:bluemix:public:iam::::role:Editor"],
17801717
"service_name": "directlink.connect"
17811718
},
17821719
{
1783-
"role_crns": [
1784-
"crn:v1:bluemix:public:iam::::serviceRole:Manager"
1785-
],
1720+
"role_crns": ["crn:v1:bluemix:public:iam::::serviceRole:Manager"],
17861721
"service_name": "power-iaas"
17871722
}
17881723
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
110110
| <a name="module_configure_monitoring_host"></a> [configure\_monitoring\_host](#module\_configure\_monitoring\_host) | ./submodules/ansible | n/a |
111111
| <a name="module_configure_network_services"></a> [configure\_network\_services](#module\_configure\_network\_services) | ./submodules/ansible | n/a |
112112
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 6.6.3 |
113-
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 2.3.0 |
113+
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 2.4.0 |
114114
| <a name="module_private_secret_engine"></a> [private\_secret\_engine](#module\_private\_secret\_engine) | terraform-ibm-modules/secrets-manager-private-cert-engine/ibm | 1.3.4 |
115115
| <a name="module_secrets_manager_group"></a> [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.2.2 |
116116
| <a name="module_secrets_manager_private_certificate"></a> [secrets\_manager\_private\_certificate](#module\_secrets\_manager\_private\_certificate) | terraform-ibm-modules/secrets-manager-private-cert/ibm | 1.3.2 |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ locals {
8181

8282
module "powervs_workspace" {
8383
source = "terraform-ibm-modules/powervs-workspace/ibm"
84-
version = "2.3.0"
84+
version = "2.4.0"
8585
providers = { ibm = ibm.ibm-pi }
8686

8787
pi_zone = var.powervs_zone

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
3-
years: 2024
4-
lastupdated: "2024-12-13"
3+
years: 2024, 2025
4+
lastupdated: "2025-01-07"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ use-case: ITServiceManagement
1515
industry: Technology
1616
compliance:
1717
content-type: reference-architecture
18-
version: v8.1.0
18+
version: v8.1.1
1919

2020
---
2121

@@ -26,7 +26,7 @@ version: v8.1.0
2626
{: toc-industry="Technology"}
2727
{: toc-use-case="ITServiceManagement"}
2828
{: toc-compliance="SAPCertified"}
29-
{: toc-version="8.1.0"}
29+
{: toc-version="8.1.1"}
3030

3131
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' 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.
3232

‎reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
3-
years: 2024
4-
lastupdated: "2024-12-13"
3+
years: 2024, 2025
4+
lastupdated: "2025-01-07"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1515
use-case: ITServiceManagement
1616
industry: Technology
1717
content-type: reference-architecture
18-
version: v8.1.0
18+
version: v8.1.1
1919
compliance: SAPCertified
2020

2121
---
@@ -28,7 +28,7 @@ compliance: SAPCertified
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance="SAPCertified"}
31-
{: toc-version="8.1.0"}
31+
{: toc-version="8.1.1"}
3232

3333
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'.
3434

‎reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
3-
years: 2024
4-
lastupdated: "2024-12-13"
3+
years: 2024, 2025
4+
lastupdated: "2025-01-07"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1515
use-case: ITServiceManagement
1616
industry: Technology
1717
content-type: reference-architecture
18-
version: v8.1.0
18+
version: v8.1.1
1919
compliance:
2020

2121
---
@@ -28,7 +28,7 @@ compliance:
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance=""}
31-
{: toc-version="8.1.0"}
31+
{: toc-version="8.1.1"}
3232

3333
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.
3434

0 commit comments

Comments
 (0)