Skip to content

Commit f09e7b3

Browse files
surajsbharadwajterraform-ibm-modules-opsludwig-mueller
authored
feat: remove stock catalog image import support(#1062)
--------- Co-authored-by: Terraform IBM Modules Operations <[email protected]> Co-authored-by: ludwig-mueller <[email protected]>
1 parent e5240ce commit f09e7b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+444
-2286
lines changed

.catalog-onboard-pipeline.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,3 @@ offerings:
2525
scc:
2626
instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
2727
region: us-south
28-
- name: import
29-
mark_ready: false
30-
install_type: fullstack
31-
scc:
32-
instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
33-
region: us-south

.secrets.baseline

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-04-07T07:37:19Z",
6+
"generated_at": "2025-05-07T12:39:51Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -92,23 +92,33 @@
9292
"hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
9393
"is_secret": false,
9494
"is_verified": false,
95-
"line_number": 46,
95+
"line_number": 45,
9696
"type": "Secret Keyword",
9797
"verified_result": null
9898
},
9999
{
100100
"hashed_secret": "a67ef662b9a11a96b15936764d77e118c9f155dd",
101101
"is_secret": false,
102102
"is_verified": false,
103-
"line_number": 59,
103+
"line_number": 58,
104104
"type": "Secret Keyword",
105105
"verified_result": null
106106
},
107107
{
108108
"hashed_secret": "6aa42ddb8d86de967d322e6fdde293bf1344c852",
109109
"is_secret": false,
110110
"is_verified": false,
111-
"line_number": 74,
111+
"line_number": 72,
112+
"type": "Secret Keyword",
113+
"verified_result": null
114+
}
115+
],
116+
"solutions/standard-plus-vsi/catalogValidationValues.json.template": [
117+
{
118+
"hashed_secret": "fa501f2ceec739604d621b521446b88d41a7f76b",
119+
"is_secret": false,
120+
"is_verified": false,
121+
"line_number": 12,
112122
"type": "Secret Keyword",
113123
"verified_result": null
114124
}
@@ -126,7 +136,7 @@
126136
"hashed_secret": "fa501f2ceec739604d621b521446b88d41a7f76b",
127137
"is_secret": false,
128138
"is_verified": false,
129-
"line_number": 75,
139+
"line_number": 85,
130140
"type": "Secret Keyword",
131141
"verified_result": null
132142
}

README.md

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,29 @@
99
## Summary
1010
This repository contains deployable architecture solutions that help provision VPC landing zones, PowerVS workspaces, and interconnect them. The solutions are available in the IBM Cloud Catalog and can also be deployed without the catalog, except for the second solution below.
1111

12-
Four solutions are offered:
13-
1. [Standard](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard)
12+
Three solutions are offered:
13+
1. [Standard Landscape](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard)
1414
- Creates a VPC and Power Virtual Server workspace, interconnects them, and configures OS network management services (SQUID proxy, NTP, NFS, and DNS services) using Ansible Galaxy collection roles [ibm.power_linux_sap collection](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/).
15-
2. [Standard Extend](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-extend)
16-
- Extends the standard solution by creating a new Power Virtual Server workspace in a different zone and interconnects with the previous solution.
15+
2. [Extend Standard Landscape](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-extend)
16+
- Extends the standard landscape solution by creating a new Power Virtual Server workspace in a different zone and interconnects with the previous solution.
1717
- This solution is typically used for **High Availability scenarios** where a single management VPC can be used to reach both PowerVS workspaces.
18-
3. [Quickstart (Standard plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-plus-vsi)
18+
3. [Quickstart (Standard Landscape plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-plus-vsi)
1919
- Creates a VPC and a Power Virtual Server workspace, interconnects them, and configures operating network management services (SQUID proxy, NTP, NFS, and DNS services) using Ansible Galaxy collection roles [ibm.power_linux_sap collection](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/).
2020
- Additionally creates a Power Virtual Server Instance of a selected t-shirt size.
2121
- This solution is typically utilized for **PoCs, demos, and quick onboarding** to PowerVS Infrastructure.
22-
4. [Import](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/import)
23-
- Takes information about an existing infrastructure and creates a schematics workspace.
24-
- The schematics workspace's ID and the outputs from it can be used to install the terraform solution 'Power Virtual Server for SAP HANA' on top of a pre-existing PowerVS infrastructure.
25-
- It creates the ACL and security group rules necessary for management services (NTP, NFS, DNS, and proxy server) and schematics engine access.
26-
- This solution is typically used for converting an existing Power Virtual Server landscape to a Schematics workspace.
2722

2823
## Reference architectures
29-
- [Standard](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md)
30-
- [Standard Extend](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md)
31-
- [Quickstart (Standard plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md)
24+
- [Standard Landscape](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md)
25+
- [Extend Standard Landscape](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md)
26+
- [Quickstart (Standard Landscape plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md)
3227

3328
## Solutions
29+
3430
| Variation | Available on IBM Catalog | Requires IBM Schematics Workspace ID | Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastructure | Creates PowerVS Instance | Performs PowerVS OS Config |
3531
| ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- |
36-
| [Standard](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard) | :heavy_check_mark: | N/A | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | N/A | N/A |
37-
| [Standard Extend](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-extend) | :heavy_check_mark: | :heavy_check_mark: | N/A | N/A | :heavy_check_mark: | N/A | N/A |
38-
| [Quickstart (Standard plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-plus-vsi) | :heavy_check_mark: | N/A | :heavy_check_mark:| :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | N/A |
39-
| [Import](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/import) | :heavy_check_mark: | N/A | N/A | N/A | N/A | N/A | N/A |
32+
| [Standard Landscape](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard) | :heavy_check_mark: | N/A | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | N/A | N/A |
33+
| [Extend Standard Landscape](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-extend) | :heavy_check_mark: | :heavy_check_mark: | N/A | N/A | :heavy_check_mark: | N/A | N/A |
34+
| [Quickstart (Standard Landscape plus VSI)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-plus-vsi) | :heavy_check_mark: | N/A | :heavy_check_mark:| :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | N/A |
4035

4136

4237
## Required IAM access policies
@@ -54,8 +49,6 @@ You need the following permissions to run this module.
5449
- `Editor` platform access
5550
- **Transit Gateway** service
5651
- `Editor` platform access
57-
- **Direct Link** service
58-
- `Editor` platform access
5952

6053
<!-- BEGIN CONTRIBUTING HOOK -->
6154
## Contributing

0 commit comments

Comments
 (0)