Skip to content

Commit 04d5e62

Browse files
ludwig-muellerterraform-ibm-modules-opssurajsbharadwaj
authored
feat: remove sharefs (#803)
BREAKING CHANGE: remove sharefs instance --------- Co-authored-by: Terraform IBM Modules Operations <Terraform.IBM.Modules.Operations@ibm.com> Co-authored-by: surajsbharadwaj <101711050+surajsbharadwaj@users.noreply.github.com>
1 parent ffb2787 commit 04d5e62

36 files changed

+165
-538
lines changed

.secrets.baseline

Lines changed: 4 additions & 4 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-03-20T13:30:12Z",
6+
"generated_at": "2025-04-01T15:36:25Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -102,7 +102,7 @@
102102
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
103103
"is_secret": false,
104104
"is_verified": false,
105-
"line_number": 58,
105+
"line_number": 55,
106106
"type": "Secret Keyword",
107107
"verified_result": null
108108
}
@@ -112,7 +112,7 @@
112112
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
113113
"is_secret": false,
114114
"is_verified": false,
115-
"line_number": 67,
115+
"line_number": 64,
116116
"type": "Secret Keyword",
117117
"verified_result": null
118118
}
@@ -122,7 +122,7 @@
122122
"hashed_secret": "4d82fc4e8ef3a90cebdf3a1fc0e4abab79a41391",
123123
"is_secret": false,
124124
"is_verified": false,
125-
"line_number": 22,
125+
"line_number": 18,
126126
"type": "Secret Keyword",
127127
"verified_result": null
128128
}

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ This repository contains deployable architecture solutions that help in deployin
1212

1313
### IBM catalog solutions that require a Schematics workspace ID of [Power Virtual Server with VPC landing zone](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-pvs-inf-2dd486c7-b317-4aaa-907b-42671485ad96-global)
1414
1. [IBM catalog PowerVS SAP Ready variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/tree/main/solutions/ibm-catalog/sap-ready-to-go)
15-
- Creates and configures **one HANA instance, zero to several NetWeaver instances, and one optional ShareFS** with **RHEL or SLES OS** distribution. Creates a private subnet for SAP communication for the entire landscape.
15+
- Creates and configures **one HANA instance and zero to several NetWeaver instances** with **RHEL or SLES OS** distribution. Creates a private subnet for SAP communication for the entire landscape.
1616
- Optionally configures OS network management services (NTP, NFS, and DNS services) using Ansible Galaxy Collection from [IBM](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/): `power_linux_sap`
1717
- Additionally tunes the instances according to SAP's best practices, which are fully ready for hosting SAP applications.
1818
2. [IBM catalog PowerVS S/4HANA or BW/4HANA variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/tree/main/solutions/ibm-catalog/sap-s4hana-bw4hana)
19-
- Creates and configures **one HANA instance, one NetWeaver instance, and one optional ShareFS** with **RHEL** OS distribution. Creates a private subnet for SAP communication for the entire landscape.
19+
- Creates and configures **one HANA instance and one NetWeaver instance** with **RHEL** OS distribution. Creates a private subnet for SAP communication for the entire landscape.
2020
- Optionally configures OS network management services (NTP, NFS, and DNS services) using Ansible Galaxy Collection from [IBM](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/): `power_linux_sap`
2121
- Tunes the instances according to SAP's best practices.
2222
- Downloads user-provided preloaded SAP Installation binaries from IBM Cloud Object Storage Bucket.
@@ -25,12 +25,12 @@ This repository contains deployable architecture solutions that help in deployin
2525

2626
### Solutions independent of IBM Cloud prerequisite Schematics workspace ID:
2727
1. [PowerVS SAP Ready variation](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/tree/main/solutions/sap-ready-to-go)
28-
- Creates and configures **one HANA instance, zero to several NetWeaver instances and one optional ShareFS** with **RHEL or SLES OS** distribution. Creates a private subnet for SAP communication for the entire landscape
28+
- Creates and configures **one HANA instance and zero to several NetWeaver instances** with **RHEL or SLES OS** distribution. Creates a private subnet for SAP communication for the entire landscape
2929
- Optionally configures OS network management services (NTP, NFS, and DNS services) using Ansible Galaxy collection from [IBM](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/)
3030
- Additionally tunes the instances according to SAP's best practices, which is fully ready for hosting SAP applications.
3131
2. [End-to-End Solution](https://github.com/terraform-ibm-modules/terraform-ibm-powervs-sap/tree/main/solutions/e2e)
3232
- 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 as a service on hosts, and sets the host as the server for the NTP, SQUID proxy and DNS services by using Ansible Galaxy Collection from [IBM](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/): `power_linux_sap`
33-
- Creates and configures **one HANA instance, zero to several NetWeaver instances, and one optional ShareFS** with **RHEL or SLES OS** distribution. Creates a private subnet for SAP communication for the entire landscape.
33+
- Creates and configures **one HANA instance and zero to several NetWeaver instances** with **RHEL or SLES OS** distribution. Creates a private subnet for SAP communication for the entire landscape.
3434
- Optionally configures OS network management services (NTP, NFS, and DNS services) using Ansible Galaxy Collection from [IBM](https://galaxy.ansible.com/ui/repo/published/ibm/power_linux_sap/): `power_linux_sap`
3535
- Additionally tunes the instances according to SAP's best practices, which is fully ready for hosting SAP applications.
3636

cra-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ CRA_TARGETS:
88
TF_VAR_powervs_zone: "syd05"
99
TF_VAR_powervs_resource_group_name: "Default"
1010
TF_VAR_external_access_ip: "0.0.0.0/0"
11-
TF_VAR_powervs_create_separate_sharefs_instance: false
1211
TF_VAR_os_image_distro: "RHEL"
1312
TF_VAR_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDb8qoH4U47+79ssT6FdsOIxxZY8/oxWc66WPwqHfpjCgDRP3Rc1uq2YEKIRJba2DzNFnf+byinH0O9hwjKZ/3l7HxNtvQZXdCnT79TOT/wGbcHBV8ZUTBkUOx67ryS0F5bKDdMDWdsWkMXkRb8AAsJWLAeuFsfMYQjMBLmvrMsRRB6GG+97jF18ghqHjuBTX1FNF9fcytEaz7WfP8KrgSYRcQOauIVlMJyOmh3gZl84u14SXwQKhQrdvqt47ZErKH+fbsgxfOvvmYgr5RktKjbmi+lyBkxRM7//BaKcPw5saThf1MiEesJxIqyL16DW9LXdWei74xHNuF65K03y975Qr9CtPkr1rGgxwU2ksqLy1NN5TnF4erd1VSuLZ5BLov7JRJ2K17ttt0agp9VmkjRFIivOek=
1413
some-user@testing-box"

ibm_catalog.json

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,6 @@
232232
{
233233
"key": "powervs_sap_network_cidr"
234234
},
235-
{
236-
"key": "powervs_create_separate_sharefs_instance",
237-
"default_value": false
238-
},
239235
{
240236
"key": "powervs_hana_instance_name"
241237
},
@@ -266,14 +262,6 @@
266262
"type": "json_editor"
267263
}
268264
},
269-
{
270-
"key": "powervs_sharefs_instance",
271-
"custom_config": {
272-
"grouping": "deployment",
273-
"original_grouping": "deployment",
274-
"type": "json_editor"
275-
}
276-
},
277265
{
278266
"key": "powervs_default_sap_images",
279267
"custom_config": {
@@ -325,9 +313,6 @@
325313
{
326314
"key": "powervs_netweaver_instance_management_ips"
327315
},
328-
{
329-
"key": "powervs_sharefs_instance_ips"
330-
},
331316
{
332317
"key": "powervs_lpars_data"
333318
}
@@ -370,7 +355,7 @@
370355
},
371356
{
372357
"title": "PowerVS instances",
373-
"description": "SAP HANA Instance: 1\n\nSAP NetWeaver Instances: 0,1..N\n\nShared SAP Instance: 0 or 1"
358+
"description": "SAP HANA Instance: 1\n\nSAP NetWeaver Instances: 0,1..N"
374359
},
375360
{
376361
"title": "SAP Monitoring Dashboard",
@@ -381,10 +366,10 @@
381366
{
382367
"diagram": {
383368
"caption": "Full SAP environment provisioned on a 'Power Virtual Server with VPC landing zone'",
384-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v3.6.3/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg",
369+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.0.0/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg",
385370
"type": "image/svg+xml"
386371
},
387-
"description": "'SAP ready PowerVS' variation of 'Power Virtual Server for SAP HANA' 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\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management and the network connectivity configuration provided by 'Power Virtual Server with VPC landing zone'."
372+
"description": "'SAP ready PowerVS' variation of 'Power Virtual Server for SAP HANA' 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 and SAP NetWeaver 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\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management and the network connectivity configuration provided by 'Power Virtual Server with VPC landing zone'."
388373
}
389374
]
390375
}
@@ -664,10 +649,6 @@
664649
{
665650
"key": "powervs_sap_network_cidr"
666651
},
667-
{
668-
"key": "powervs_create_separate_sharefs_instance",
669-
"default_value": false
670-
},
671652
{
672653
"key": "powervs_hana_instance_name"
673654
},
@@ -683,14 +664,6 @@
683664
{
684665
"key": "powervs_netweaver_instance_storage_config"
685666
},
686-
{
687-
"key": "powervs_sharefs_instance",
688-
"custom_config": {
689-
"grouping": "deployment",
690-
"original_grouping": "deployment",
691-
"type": "json_editor"
692-
}
693-
},
694667
{
695668
"key": "powervs_default_sap_images",
696669
"custom_config": {
@@ -732,9 +705,6 @@
732705
{
733706
"key": "powervs_netweaver_instance_management_ip"
734707
},
735-
{
736-
"key": "powervs_sharefs_instance_ips"
737-
},
738708
{
739709
"key": "powervs_lpars_data"
740710
},
@@ -786,7 +756,7 @@
786756
},
787757
{
788758
"title": "PowerVS instances",
789-
"description": "SAP HANA Instance: 1\n\nSAP NetWeaver Instances: 1\n\nShared SAP Instance: 0 or 1"
759+
"description": "SAP HANA Instance: 1\n\nSAP NetWeaver Instances: 1"
790760
},
791761
{
792762
"title": "SAP Monitoring Dashboard",
@@ -797,10 +767,10 @@
797767
{
798768
"diagram": {
799769
"caption": "Full SAP S/4HANA or BW/4HANA environment provisioned on a 'Power Virtual Server with VPC landing zone'",
800-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v3.6.3/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
770+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.0.0/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
801771
"type": "image/svg+xml"
802772
},
803-
"description": "'SAP S/4HANA or BW/4HANA' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape builds on the foundation of '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. S/4HANA or BW/4HANA solution is installed based on selected version. \n\nServices such as DNS, NTP and NFS running in VPC and provided by 'Power Virtual Server with VPC landing zone' are leveraged.\n\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management and the network connectivity configuration provided by the 'Power Virtual Server with VPC landing zone'. Additionally if a Monitoring Instance was configured in the 'Power Virtual Server with VPC landing zone' deployment, this solution will then install and enable SAP monitoring Dashboard."
773+
"description": "'SAP S/4HANA or BW/4HANA' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape builds on the foundation of 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and preconfigured for SAP installation. S/4HANA or BW/4HANA solution is installed based on selected version. \n\nServices such as DNS, NTP and NFS running in VPC and provided by 'Power Virtual Server with VPC landing zone' are leveraged.\n\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management and the network connectivity configuration provided by the 'Power Virtual Server with VPC landing zone'. Additionally if a Monitoring Instance was configured in the 'Power Virtual Server with VPC landing zone' deployment, this solution will then install and enable SAP monitoring Dashboard."
804774
}
805775
]
806776
}

0 commit comments

Comments
 (0)