Skip to content

Commit 14d4497

Browse files
fix: remove import variation
SKIP UPGRADE TEST: Breaking change auto stock image import
1 parent e131094 commit 14d4497

31 files changed

+4
-1802
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

README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,23 @@ Four solutions are offered:
1515
2. [Standard Landscape Extend](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/solutions/standard-extend)
1616
- 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 Landscape](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
2924
- [Standard Landscape](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md)
3025
- [Standard Landscape Extend 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)
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)
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
3429

3530
| 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 |
3631
| ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- |
3732
| [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 |
3833
| [Standard Landscape 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 |
39-
| [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 |
40-
| [Import Landscape](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 |
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 |
4135

4236

4337
## Required IAM access policies

ibm_catalog.json

Lines changed: 1 addition & 324 deletions
Large diffs are not rendered by default.

modules/import-powervs-vpc/acl/main.tf

Lines changed: 0 additions & 73 deletions
This file was deleted.

modules/import-powervs-vpc/acl/outputs.tf

Whitespace-only changes.

modules/import-powervs-vpc/acl/variables.tf

Lines changed: 0 additions & 36 deletions
This file was deleted.

modules/import-powervs-vpc/acl/versions.tf

Lines changed: 0 additions & 13 deletions
This file was deleted.

modules/import-powervs-vpc/powervs/main.tf

Lines changed: 0 additions & 17 deletions
This file was deleted.

modules/import-powervs-vpc/powervs/outputs.tf

Lines changed: 0 additions & 40 deletions
This file was deleted.

modules/import-powervs-vpc/powervs/variables.tf

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)