Skip to content

Commit 9eb9e48

Browse files
surajsbharadwajstafaniasaju
surajsbharadwaj
and
stafaniasaju
authored
feat: upgrade terraform-ibm-modules/powervs-instance/ibm version to 1.0.2 (#534)
--------- Co-authored-by: stafaniasaju <[email protected]>
1 parent ba225b6 commit 9eb9e48

Some content is hidden

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

74 files changed

+2078
-1798
lines changed

‎.secrets.baseline‎

Lines changed: 17 additions & 7 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": "2023-11-02T14:24:11Z",
6+
"generated_at": "2023-11-02T15:28:02Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -87,22 +87,32 @@
8787
"verified_result": null
8888
}
8989
],
90-
"modules/powervs_attach_private_network/README.md": [
90+
"modules/pi-sap-system-type1/README.md": [
9191
{
92-
"hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
92+
"hashed_secret": "3bd02b996f65f3548c1a0b5d93b00bfa7c88341a",
9393
"is_secret": false,
9494
"is_verified": false,
95-
"line_number": 9,
95+
"line_number": 56,
9696
"type": "Secret Keyword",
9797
"verified_result": null
9898
}
9999
],
100-
"modules/powervs_create_private_network/README.md": [
100+
"solutions/sap-ready-to-go/README.md": [
101101
{
102-
"hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
102+
"hashed_secret": "3bd02b996f65f3548c1a0b5d93b00bfa7c88341a",
103103
"is_secret": false,
104104
"is_verified": false,
105-
"line_number": 9,
105+
"line_number": 61,
106+
"type": "Secret Keyword",
107+
"verified_result": null
108+
}
109+
],
110+
"solutions/sap-ready-to-go/input.tfvars": [
111+
{
112+
"hashed_secret": "4d82fc4e8ef3a90cebdf3a1fc0e4abab79a41391",
113+
"is_secret": false,
114+
"is_verified": false,
115+
"line_number": 19,
106116
"type": "Secret Keyword",
107117
"verified_result": null
108118
}

‎README.md‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- BEGIN MODULE HOOK -->
22

3-
# SAP on secure Power Virtual Servers Solutions
3+
# IBM Power Virtual Server for SAP HANA solutions
44

55
<!-- UPDATE BADGE: Update the link for the badge below-->
66
[![Graduated (Supported)](https://img.shields.io/badge/status-Graduated%20(Supported)-brightgreen?style=plastic)](https://terraform-ibm-modules.github.io/documentation/#/badge-status)
@@ -9,10 +9,45 @@
99
[![latest release](https://img.shields.io/github/v/release/terraform-ibm-modules/terraform-ibm-powervs-sap?logo=GitHub&sort=semver)](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/releases/latest)
1010
[![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/)
1111

12-
# Table of Contents
13-
1. [Required IAM access policies](#required-iam-access-policies)
14-
2. [Reference architectures](#reference-architectures)
15-
3. [Solutions](#solutions)
12+
## Summary
13+
This repository contains deployable architecture solutions which helps in deploying Power Virtual Server for SAP HANA solutions. The solutions are available in IBM Cloud Catalog and also can be deployed without catalog as well except few solutions.
14+
15+
Three solutions are offered:
16+
1. [IBM catalog PowerVS sap-ready-to-go variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/tree/main/solutions/ibm-catalog/sap-ready-to-go)
17+
- Creates and configures 1 HANA instance, 0 to N Netweaver Instances and 1 Optional ShareFS with RHEL or SLES Os distribution. Creates a new private subnet for SAP communication for entire landscape and attaches it to cloud connections(in Non PER DC).
18+
- Optionally configures os network management services(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/).
19+
- Additionally tunes the instances according to SAPs best practices which is fully ready for hosting SAP applications.
20+
2. [PowerVS sap-ready-to-go variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/tree/main/solutions/sap-ready-to-go)
21+
- Creates and configures 1 HANA instance, 0 to N Netweaver Instances and 1 Optional ShareFS with RHEL or SLES Os distribution. Creates a new private subnet for SAP communication for entire landscape and attaches it to cloud connections(in Non PER DC).
22+
- Optionally configures os network management services(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/).
23+
- Additionally tunes the instances according to SAPs best practices which is fully ready for hosting SAP applications.
24+
3. [End to End Solution](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/tree/main/solutions/e2e)
25+
- Creates a [Power Virtual Server with vpc landing zone](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/tree/main/modules/powervs-vpc-landing-zone) which creates a VPC Infrastructure and PowerVS infrastructure. Installs and configures the Squid Proxy, DNS Forwarder, NTP forwarder and NFS on hosts, and sets the host as the server for the NTP, NFS, and DNS services by using ansible galaxy collection roles [ibm.power_linux_sap collection](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/).
26+
- Creates and configures 1 HANA instance, 0 to N Netweaver Instances and 1 Optional ShareFS with RHEL or SLES Os distribution. Creates a new private subnet for SAP communication for entire landscape and attaches it to cloud connections(in Non PER DC).
27+
- Optionally configures os network management services(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/).
28+
- Additionally tunes the instances according to SAPs best practices which is fully ready for hosting SAP applications.
29+
30+
## Reference architectures
31+
- [IBM catalog PowerVS sap-ready-to-go variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/blob/main/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg)
32+
- [Power Virtual Server with vpc landing zone](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/blob/main/reference-architectures/full-stack/deploy-arch-ibm-pvs-inf-full-stack.svg)
33+
34+
35+
## Solutions
36+
| Variation | Available on IBM Catalog | Requires Schematics Workspace ID | Creates PowerVS with VPC landing zone | Creates PowerVS HANA Instance | Creates PowerVS NW Instances | Performs PowerVS OS Config | Performs PowerVS SAP Tuning | Install SAP software |
37+
|:---------------------------------------------------------------------------:|:------------------------:|:--------------------------------:|:-------------------------------------:|:-----------------------------:|:----------------------------:|:--------------------------:|:---------------------------:|:--------------------:|
38+
| [ IBM Catalog sap-ready-to-go ]( ./solutions/ibm-catalog/sap-ready-to-go/ ) | :heavy_check_mark: | :heavy_check_mark: | N/A | 1 | 0 to N | :heavy_check_mark: | :heavy_check_mark: | N/A |
39+
| [ sap-ready-to-go ]( ./solutions/sap-ready-to-go/ ) | N/A | N/A | N/A | 1 | 0 to N | :heavy_check_mark: | :heavy_check_mark: | N/A |
40+
| [ End-to-End ]( ./solutions/e2e/ ) | N/A | N/A | :heavy_check_mark: | 1 | 0 to N | :heavy_check_mark: | :heavy_check_mark: | N/A |
41+
42+
43+
<!-- BEGIN OVERVIEW HOOK -->
44+
## Overview
45+
* [terraform-ibm-powervs-sap](#terraform-ibm-powervs-sap)
46+
* [Submodules](./modules)
47+
* [pi-sap-system-type1](./modules/pi-sap-system-type1)
48+
* [Contributing](#contributing)
49+
<!-- END OVERVIEW HOOK -->
50+
1651

1752
## Required IAM access policies
1853

@@ -34,19 +69,6 @@ You need the following permissions to run this module.
3469

3570
<!-- END MODULE HOOK -->
3671

37-
## Reference architectures
38-
39-
- [SAP Ready to go PowerVS](reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md)
40-
41-
42-
## Solutions
43-
44-
| Variation | Available on IBM Catalog | Requires Schematics Workspace ID | Creates PowerVS HANA Instance | Creates PowerVS NW Instances | Performs PowerVS OS Config | Performs PowerVS SAP Tuning | Install SAP software |
45-
| ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- | ------------- |
46-
| [sap-ready-to-go](./solutions/ibm-catalog/sap-ready-to-go/) | :heavy_check_mark: | :heavy_check_mark: | 1 | 0 to N | :heavy_check_mark: | :heavy_check_mark: | N/A |
47-
| [sap-ready-to-go](./solutions/sap-ready-to-go/) | N/A | N/A | 1 | 0 to N | :heavy_check_mark: | :heavy_check_mark: | N/A |
48-
49-
5072

5173
<!-- BEGIN CONTRIBUTING HOOK -->
5274
## Contributing
@@ -55,25 +77,3 @@ You can report issues and request features for this module in GitHub issues in t
5577

5678
To set up your local development environment, see [Local development setup](https://terraform-ibm-modules.github.io/documentation/#/local-dev-setup) in the project documentation.
5779
<!-- END CONTRIBUTING HOOK -->
58-
59-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
60-
### Requirements
61-
62-
No requirements.
63-
64-
### Modules
65-
66-
No modules.
67-
68-
### Resources
69-
70-
No resources.
71-
72-
### Inputs
73-
74-
No inputs.
75-
76-
### Outputs
77-
78-
No outputs.
79-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎cra-config.yaml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
version: "v1"
22
CRA_TARGETS:
3-
- CRA_TARGET: "solutions/basic"
3+
- CRA_TARGET: "solutions/e2e"
44
PROFILE_ID: "0e6e7b5a-817d-4344-ab6f-e5d7a9c49520" # SCC profile ID (currently set to the FSCloud 1.4.0 profile).
55
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
66
CRA_ENVIRONMENT_VARIABLES:
7-
TF_VAR_prefix: "cra-infra"
7+
TF_VAR_prefix: "cra-sap"
8+
TF_VAR_powervs_zone: "syd05"
9+
TF_VAR_powervs_resource_group_name: "Default"
10+
TF_VAR_landing_zone_configuration: "3VPC_RHEL"
11+
TF_VAR_external_access_ip: "0.0.0.0/0"
12+
TF_VAR_powervs_create_separate_sharefs_instance: false
13+
TF_VAR_os_image_distro: "RHEL"
14+
TF_VAR_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDb8qoH4U47+79ssT6FdsOIxxZY8/oxWc66WPwqHfpjCgDRP3Rc1uq2YEKIRJba2DzNFnf+byinH0O9hwjKZ/3l7HxNtvQZXdCnT79TOT/wGbcHBV8ZUTBkUOx67ryS0F5bKDdMDWdsWkMXkRb8AAsJWLAeuFsfMYQjMBLmvrMsRRB6GG+97jF18ghqHjuBTX1FNF9fcytEaz7WfP8KrgSYRcQOauIVlMJyOmh3gZl84u14SXwQKhQrdvqt47ZErKH+fbsgxfOvvmYgr5RktKjbmi+lyBkxRM7//BaKcPw5saThf1MiEesJxIqyL16DW9LXdWei74xHNuF65K03y975Qr9CtPkr1rGgxwU2ksqLy1NN5TnF4erd1VSuLZ5BLov7JRJ2K17ttt0agp9VmkjRFIivOek= some-user@testing-box"
15+
TF_VAR_ssh_private_key: "some_key"

‎cra-tf-validate-ignore-rules.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
"description": "Check whether Cloud Object Storage network access is restricted to a specific IP range",
66
"ignore_reason": "In order for this rule to pass, Context Based Restrictions (CBRs) support needs to be added to the module (tracking in https://github.ibm.com/GoldenEye/issues/issues/5626). Even after that is added, there is still a dependency on SCC to support scanning for CBR rules. SCC CBR support is being tracked in https://github.ibm.com/project-fortress/pm/issues/11800.",
77
"is_valid": true
8+
},
9+
{
10+
"scc_rule_id": "rule-216e2449-27d7-4afc-929a-b66e196a9cf9",
11+
"description": "Check whether Flow Logs for VPC are enabled",
12+
"ignore_reason": "In order for this rule to pass, Context Based Restrictions (CBRs) support needs to be added to the module (tracking in https://github.ibm.com/GoldenEye/issues/issues/5626). Even after that is added, there is still a dependency on SCC to support scanning for CBR rules. SCC CBR support is being tracked in https://github.ibm.com/project-fortress/pm/issues/11800.",
13+
"is_valid": true
814
}
915
]
1016
}

‎ibm_catalog.json‎

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"id": "2dd486c7-b317-4aaa-907b-42671485ad96-global",
5656
"name": "deploy-arch-ibm-pvs-inf",
5757
"install_type": "fullstack",
58-
"version": ">=1.0.0"
58+
"version": ">=3.0.0"
5959
}
6060
],
6161
"configuration": [
@@ -67,7 +67,7 @@
6767
"catalogID": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc",
6868
"flavorConstraint": "powervs-workspace",
6969
"offeringID": "2dd486c7-b317-4aaa-907b-42671485ad96-global",
70-
"versionConstraint": ">=1.0.0"
70+
"versionConstraint": ">=3.0.0"
7171
},
7272
"grouping": "deployment",
7373
"original_grouping": "deployment",
@@ -129,7 +129,7 @@
129129
"value": "us-south"
130130
},
131131
{
132-
"displayname": "Dallas 10 (dal10)",
132+
"displayname": "Dallas 10 (dal10) PER",
133133
"value": "dal10"
134134
},
135135
{
@@ -169,15 +169,16 @@
169169
"custom_config": {}
170170
},
171171
{
172-
"key": "powervs_create_separate_fs_share",
173-
"required": true
172+
"key": "powervs_create_separate_sharefs_instance",
173+
"required": true,
174+
"default_value": ""
174175
},
175176
{
176177
"key": "powervs_hana_instance_name",
177178
"required": true
178179
},
179180
{
180-
"key": "powervs_hana_sap_profile_id",
181+
"key": "powervs_hana_instance_sap_profile_id",
181182
"required": true
182183
},
183184
{
@@ -221,19 +222,44 @@
221222
"required": true
222223
},
223224
{
224-
"key": "powervs_share_storage_config"
225+
"key": "powervs_hana_instance_custom_storage_config",
226+
"custom_config": {
227+
"grouping": "deployment",
228+
"original_grouping": "deployment",
229+
"type": "json_editor"
230+
}
225231
},
226232
{
227-
"key": "powervs_hana_custom_storage_config"
233+
"key": "powervs_hana_instance_additional_storage_config",
234+
"custom_config": {
235+
"grouping": "deployment",
236+
"original_grouping": "deployment",
237+
"type": "json_editor"
238+
}
228239
},
229240
{
230-
"key": "powervs_hana_additional_storage_config"
241+
"key": "powervs_netweaver_instance_storage_config",
242+
"custom_config": {
243+
"grouping": "deployment",
244+
"original_grouping": "deployment",
245+
"type": "json_editor"
246+
}
231247
},
232248
{
233-
"key": "powervs_netweaver_storage_config"
249+
"key": "powervs_sharefs_instance",
250+
"custom_config": {
251+
"grouping": "deployment",
252+
"original_grouping": "deployment",
253+
"type": "json_editor"
254+
}
234255
},
235256
{
236-
"key": "powervs_default_images"
257+
"key": "powervs_default_sap_images",
258+
"custom_config": {
259+
"grouping": "deployment",
260+
"original_grouping": "deployment",
261+
"type": "json_editor"
262+
}
237263
}
238264
],
239265
"outputs": [
@@ -256,7 +282,7 @@
256282
"key": "powervs_netweaver_instance_management_ips"
257283
},
258284
{
259-
"key": "powervs_share_fs_ips"
285+
"key": "powervs_sharefs_instance_ips"
260286
},
261287
{
262288
"key": "powervs_lpars_data"
@@ -296,15 +322,11 @@
296322
},
297323
{
298324
"title": "PowerVS instances",
299-
"description": "SAP HANA Instance: One\n\nSAP NetWeaver Instances: 0,1..N\n\nShared SAP Instance: 0 or 1"
325+
"description": "SAP HANA Instance: 1\n\nSAP NetWeaver Instances: 0,1..N\n\nShared SAP Instance: 0 or 1"
300326
},
301327
{
302328
"title": "Power Virtual Server with VPC landing zone",
303329
"description": "Available"
304-
},
305-
{
306-
"title": "Secure infrastructure on VPC for regulated industries",
307-
"description": "Available"
308330
}
309331
],
310332
"diagrams": [
@@ -314,7 +336,7 @@
314336
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/main/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg",
315337
"type": "image/svg+xml"
316338
},
317-
"description": "'SAP ready PowerVS' variation of 'SAP on secure Power Virtual Servers' creates a basic and expandable SAP system landscape builds on the foundation of the 'Secure infrastructure on VPC for regulated industries' and 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA, SAP NetWeaver and optionally for shared SAP files are deployed and preconfigured for SAP installation.\n\nServices such as DNS, NTP and NFS running in VPC and provided by 'Power Virtual Server with VPC landing zone' are leveraged.\n\nRedundant IBM Cloud Connections provide the network bridge between the IBM Power infrastructure and the IBM VPC and public internet.\n\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management from the 'Secure infrastructure on VPC for regulated industries' and the network connectivity configuration provided by 'Power Virtual Server with VPC landing zone'."
339+
"description": "'SAP ready PowerVS' variation of 'SAP on secure Power Virtual Servers' creates a basic and expandable SAP system landscape builds on the foundation of the 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA, SAP NetWeaver and optionally for shared SAP files are deployed and preconfigured for SAP installation.\n\nServices such as DNS, NTP and NFS running in VPC and provided by 'Power Virtual Server with VPC landing zone' are leveraged.\n\nRedundant IBM Cloud Connections provide the network bridge between the IBM Power infrastructure and the IBM VPC and public internet.\n\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management from the 'Secure infrastructure on VPC for regulated industries' and the network connectivity configuration provided by 'Power Virtual Server with VPC landing zone'."
318340
}
319341
]
320342
}

0 commit comments

Comments
 (0)