Skip to content

Commit 04f5396

Browse files
ludwig-muellersurajsbharadwaj
ludwig-mueller
and
surajsbharadwaj
authored
feat: enable bring your own license to both variations (#778)
* feat: enable byol with proxy for rhel * feat: enable byol in sap-ready-to-go variation * feat: enable byol in s4hana-bw4hana variation * fix: switch instance repo release from branch to newest version (2.4.0) * docs: update readme * docs: release notes 3.5.0 * refactor: vars * fix: split os registration variable for ui compatility * docs: improve variable description * fix: correct widgets in catalog * refactor: description * feat: enable byol in non ibm catalog sap-ready-to-go solution * chore: rename file * docs: enhance description --------- Co-authored-by: surajsbharadwaj <suraj.bharadwaj@ibm.com>
1 parent 69497c7 commit 04f5396

File tree

20 files changed

+630
-385
lines changed

20 files changed

+630
-385
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": "2024-12-17T18:27:59Z",
6+
"generated_at": "2025-01-30T15:02:17Z",
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": 55,
105+
"line_number": 56,
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": 61,
115+
"line_number": 65,
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": 18,
125+
"line_number": 22,
126126
"type": "Secret Keyword",
127127
"verified_result": null
128128
}

‎ibm_catalog.json

Lines changed: 81 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@
164164
"required": true,
165165
"default_value": ""
166166
},
167-
{
168-
"key": "powervs_sap_network_cidr",
169-
"required": true
170-
},
171167
{
172168
"key": "os_image_distro",
173169
"type": "string",
@@ -185,15 +181,6 @@
185181
],
186182
"custom_config": {}
187183
},
188-
{
189-
"key": "powervs_create_separate_sharefs_instance",
190-
"required": true,
191-
"default_value": ""
192-
},
193-
{
194-
"key": "powervs_hana_instance_name",
195-
"required": true
196-
},
197184
{
198185
"key": "powervs_hana_instance_sap_profile_id",
199186
"required": true
@@ -202,10 +189,6 @@
202189
"key": "powervs_netweaver_instance_count",
203190
"required": true
204191
},
205-
{
206-
"key": "powervs_netweaver_instance_name",
207-
"required": true
208-
},
209192
{
210193
"key": "powervs_netweaver_cpu_number",
211194
"required": true
@@ -237,8 +220,20 @@
237220
}
238221
},
239222
{
240-
"key": "sap_domain",
241-
"required": true
223+
"key": "sap_domain"
224+
},
225+
{
226+
"key": "powervs_sap_network_cidr"
227+
},
228+
{
229+
"key": "powervs_create_separate_sharefs_instance",
230+
"default_value": false
231+
},
232+
{
233+
"key": "powervs_hana_instance_name"
234+
},
235+
{
236+
"key": "powervs_netweaver_instance_name"
242237
},
243238
{
244239
"key": "powervs_hana_instance_custom_storage_config",
@@ -279,6 +274,29 @@
279274
"original_grouping": "deployment",
280275
"type": "json_editor"
281276
}
277+
},
278+
{
279+
"key": "powervs_os_registration_username"
280+
},
281+
{
282+
"key": "powervs_os_registration_password",
283+
"type": "multiline_secure_value",
284+
"display_name": "Multiline secure value",
285+
"custom_config": {
286+
"grouping": "deployment",
287+
"original_grouping": "deployment",
288+
"type": "multiline_secure_value"
289+
}
290+
},
291+
{
292+
"key": "ansible_vault_password",
293+
"type": "multiline_secure_value",
294+
"display_name": "Multiline secure value",
295+
"custom_config": {
296+
"grouping": "deployment",
297+
"original_grouping": "deployment",
298+
"type": "multiline_secure_value"
299+
}
282300
}
283301
],
284302
"outputs": [
@@ -336,23 +354,27 @@
336354
"architecture": {
337355
"features": [
338356
{
339-
"title": "SAP solution",
357+
"title": "Power Virtual Server with VPC landing zone Standard Variation",
358+
"description": "Pre Requisite"
359+
},
360+
{
361+
"title": "SAP Solution",
340362
"description": "Not installed"
341363
},
342364
{
343365
"title": "PowerVS instances",
344366
"description": "SAP HANA Instance: 1\n\nSAP NetWeaver Instances: 0,1..N\n\nShared SAP Instance: 0 or 1"
345367
},
346368
{
347-
"title": "Power Virtual Server with VPC landing zone",
348-
"description": "Available"
369+
"title": "SAP Monitoring Dashboard",
370+
"description": "Not Installed"
349371
}
350372
],
351373
"diagrams": [
352374
{
353375
"diagram": {
354376
"caption": "Full SAP environment provisioned on a 'Power Virtual Server with VPC landing zone'",
355-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v3.4.0/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg",
377+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v3.5.0/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg",
356378
"type": "image/svg+xml"
357379
},
358380
"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'."
@@ -481,27 +503,10 @@
481503
"required": true,
482504
"default_value": ""
483505
},
484-
{
485-
"key": "powervs_sap_network_cidr",
486-
"required": true
487-
},
488-
{
489-
"key": "powervs_create_separate_sharefs_instance",
490-
"required": true,
491-
"default_value": ""
492-
},
493-
{
494-
"key": "powervs_hana_instance_name",
495-
"required": true
496-
},
497506
{
498507
"key": "powervs_hana_instance_sap_profile_id",
499508
"required": true
500509
},
501-
{
502-
"key": "powervs_netweaver_instance_name",
503-
"required": true
504-
},
505510
{
506511
"key": "powervs_netweaver_cpu_number",
507512
"required": true
@@ -645,6 +650,19 @@
645650
"type": "multiline_secure_value"
646651
}
647652
},
653+
{
654+
"key": "powervs_sap_network_cidr"
655+
},
656+
{
657+
"key": "powervs_create_separate_sharefs_instance",
658+
"default_value": false
659+
},
660+
{
661+
"key": "powervs_hana_instance_name"
662+
},
663+
{
664+
"key": "powervs_netweaver_instance_name"
665+
},
648666
{
649667
"key": "powervs_hana_instance_custom_storage_config"
650668
},
@@ -669,6 +687,19 @@
669687
"original_grouping": "deployment",
670688
"type": "json_editor"
671689
}
690+
},
691+
{
692+
"key": "powervs_os_registration_username"
693+
},
694+
{
695+
"key": "powervs_os_registration_password",
696+
"type": "multiline_secure_value",
697+
"display_name": "Multiline secure value",
698+
"custom_config": {
699+
"grouping": "deployment",
700+
"original_grouping": "deployment",
701+
"type": "multiline_secure_value"
702+
}
672703
}
673704
],
674705
"outputs": [
@@ -735,26 +766,30 @@
735766
"architecture": {
736767
"features": [
737768
{
738-
"title": "SAP solution",
739-
"description": "Installed: SAP S/4HANA or BW/4HANA "
769+
"title": "Power Virtual Server with VPC landing zone Standard Variation",
770+
"description": "Pre Requisite"
771+
},
772+
{
773+
"title": "SAP Solution",
774+
"description": "Installed: SAP S/4HANA or BW/4HANA"
740775
},
741776
{
742777
"title": "PowerVS instances",
743778
"description": "SAP HANA Instance: 1\n\nSAP NetWeaver Instances: 1\n\nShared SAP Instance: 0 or 1"
744779
},
745780
{
746-
"title": "Power Virtual Server with VPC landing zone",
747-
"description": "Available"
781+
"title": "SAP Monitoring Dashboard",
782+
"description": "Installed and enabled"
748783
}
749784
],
750785
"diagrams": [
751786
{
752787
"diagram": {
753788
"caption": "Full SAP S/4HANA or BW/4HANA environment provisioned on a 'Power Virtual Server with VPC landing zone'",
754-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v3.4.0/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
789+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v3.5.0/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
755790
"type": "image/svg+xml"
756791
},
757-
"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'."
792+
"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."
758793
}
759794
]
760795
}

0 commit comments

Comments
 (0)