Skip to content

Commit e92b3e9

Browse files
surajsbharadwajsurajsbharadwaj
authored
feat: initial version
BREAKING CHANGE: remove root module
1 parent d12e1ac commit e92b3e9

Some content is hidden

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

66 files changed

+1780
-3168
lines changed

‎.secrets.baseline‎

Lines changed: 3 additions & 41 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-06-14T15:31:30Z",
6+
"generated_at": "2023-06-23T16:57:16Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -77,24 +77,6 @@
7777
}
7878
],
7979
"results": {
80-
"README.md": [
81-
{
82-
"hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
83-
"is_secret": false,
84-
"is_verified": false,
85-
"line_number": 38,
86-
"type": "Secret Keyword",
87-
"verified_result": null
88-
},
89-
{
90-
"hashed_secret": "a67ef662b9a11a96b15936764d77e118c9f155dd",
91-
"is_secret": false,
92-
"is_verified": false,
93-
"line_number": 79,
94-
"type": "Secret Keyword",
95-
"verified_result": null
96-
}
97-
],
9880
"ibm_catalog.json": [
9981
{
10082
"hashed_secret": "83b1c425484475e97934007eccb2277e9bdbd203",
@@ -115,17 +97,7 @@
11597
"verified_result": null
11698
}
11799
],
118-
"submodules/initial_validation/README.md": [
119-
{
120-
"hashed_secret": "3bd02b996f65f3548c1a0b5d93b00bfa7c88341a",
121-
"is_secret": false,
122-
"is_verified": false,
123-
"line_number": 24,
124-
"type": "Secret Keyword",
125-
"verified_result": null
126-
}
127-
],
128-
"submodules/power_attach_private_network/README.md": [
100+
"modules/powervs_attach_private_network/README.md": [
129101
{
130102
"hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
131103
"is_secret": false,
@@ -135,7 +107,7 @@
135107
"verified_result": null
136108
}
137109
],
138-
"submodules/power_create_private_network/README.md": [
110+
"modules/powervs_create_private_network/README.md": [
139111
{
140112
"hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
141113
"is_secret": false,
@@ -144,16 +116,6 @@
144116
"type": "Secret Keyword",
145117
"verified_result": null
146118
}
147-
],
148-
"submodules/power_instance/README.md": [
149-
{
150-
"hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
151-
"is_secret": false,
152-
"is_verified": false,
153-
"line_number": 13,
154-
"type": "Secret Keyword",
155-
"verified_result": null
156-
}
157119
]
158120
},
159121
"version": "0.13.1+ibm.61.dss",

‎README.md‎

Lines changed: 18 additions & 161 deletions
Large diffs are not rendered by default.

‎common-dev-assets‎

‎ibm_catalog.json‎

Lines changed: 48 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -45,65 +45,34 @@
4545
"label": "SAP ready PowerVS",
4646
"name": "sap-ready-to-go",
4747
"install_type": "extension",
48-
"working_directory": "solutions/ibm-catalog/deployable-architectures/sap-ready-to-go",
48+
"working_directory": "solutions/ibm-catalog/sap-ready-to-go",
4949
"usage_template": "module \"sap_systems\" {\n source = \"https://cm.globalcatalog.cloud.ibm.com/api/v1-beta/offering/source//${{workingDirectory}}?archive=tgz&flavor=${{flavor}}&kind=${{kind}}&name=${{name}}&version=${{version}}\"\n ibmcloud_api_key = var.ibmcloud_api_key\n prerequisite_workspace_id = var.prerequisite_workspace_id\n powervs_zone = var.powervs_zone\n prefix = var.prefix\n ssh_private_key = var.ssh_private_key\n}",
50-
"compliance": {
51-
"authority": "scc-v3",
52-
"controls": [
53-
{
54-
"profile": {
55-
"name": "IBM Cloud for Financial Services",
56-
"version": "1.2.0"
57-
},
58-
"names": [
59-
"AC-2(4)(0)",
60-
"AC-2(7)(b)",
61-
"AC-2(g)",
62-
"AC-6(9)(0)",
63-
"AU-2(a)",
64-
"AU-2(d)",
65-
"AU-3(0)",
66-
"AU-4(0)",
67-
"AU-8(1)(a)",
68-
"AU-8(1)(b)",
69-
"AU-8(a)",
70-
"AU-8(b)",
71-
"AU-11(0)",
72-
"AU-12(a)",
73-
"AU-12(b)",
74-
"AU-12(c)",
75-
"CA-7(d)",
76-
"IA-3(0)",
77-
"SC-2(0)",
78-
"SC-3(0)",
79-
"SC-7(4)(c)",
80-
"SC-8(0)",
81-
"SC-8(1)(0)",
82-
"SC-11(0)",
83-
"SC-23(0)",
84-
"SI-4(a)",
85-
"SI-4(b)",
86-
"SI-4(c)",
87-
"SI-12(0)"
88-
]
89-
}
90-
]
91-
},
50+
"compliance": {},
51+
"dependencies": [
52+
{
53+
"flavors": [
54+
"powervs-workspace"
55+
],
56+
"id": "2dd486c7-b317-4aaa-907b-42671485ad96-global",
57+
"name": "deploy-arch-ibm-pvs-inf",
58+
"version": ">=1.0.0"
59+
}
60+
],
9261
"configuration": [
9362
{
63+
"key": "prerequisite_workspace_id",
64+
"required": true,
9465
"custom_config": {
9566
"config_constraints": {
96-
"catalogID": "da12d6f3-3cb7-402e-9350-878837212a6e",
67+
"catalogID": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc",
9768
"flavorConstraint": "powervs-workspace",
98-
"offeringID": "2dd486c7-b317-4aaa-907b-42671485ad96",
99-
"versionConstraint": "\u003e=1.0.0"
69+
"offeringID": "2dd486c7-b317-4aaa-907b-42671485ad96-global",
70+
"versionConstraint": ">=1.0.0"
10071
},
10172
"grouping": "deployment",
10273
"original_grouping": "deployment",
10374
"type": "schematics_workspace"
104-
},
105-
"key": "prerequisite_workspace_id",
106-
"required": true
75+
}
10776
},
10877
{
10978
"key": "powervs_zone",
@@ -159,10 +128,6 @@
159128
"displayname": "US-south (us-south)",
160129
"value": "us-south"
161130
},
162-
{
163-
"displayname": "Dallas (dal10)",
164-
"value": "dal10"
165-
},
166131
{
167132
"displayname": "Dallas (dal12)",
168133
"value": "dal12"
@@ -172,7 +137,6 @@
172137
"value": "us-east"
173138
}
174139
],
175-
"hidden": false,
176140
"custom_config": {}
177141
},
178142
{
@@ -198,39 +162,34 @@
198162
"value": "SLES"
199163
}
200164
],
201-
"hidden": false,
202165
"custom_config": {}
203166
},
204167
{
205-
"key": "create_separate_fs_share",
168+
"key": "powervs_create_separate_fs_share",
206169
"required": true
207170
},
208171
{
209-
"key": "sap_hana_profile",
172+
"key": "powervs_hana_instance_name",
210173
"required": true
211174
},
212175
{
213-
"key": "sap_hana_hostname",
176+
"key": "powervs_hana_sap_profile_id",
214177
"required": true
215178
},
216179
{
217-
"key": "sap_netweaver_cpu_number",
180+
"key": "powervs_netweaver_instance_count",
218181
"required": true
219182
},
220183
{
221-
"key": "sap_netweaver_memory_size",
184+
"key": "powervs_netweaver_instance_name",
222185
"required": true
223186
},
224187
{
225-
"key": "sap_netweaver_hostname",
188+
"key": "powervs_netweaver_cpu_number",
226189
"required": true
227190
},
228191
{
229-
"key": "sap_netweaver_instance_number",
230-
"required": true
231-
},
232-
{
233-
"key": "configure_os",
192+
"key": "powervs_netweaver_memory_size",
234193
"required": true
235194
},
236195
{
@@ -258,63 +217,45 @@
258217
"required": true
259218
},
260219
{
261-
"key": "default_hana_rhel_image"
262-
},
263-
{
264-
"key": "default_hana_sles_image"
220+
"key": "powervs_share_storage_config"
265221
},
266222
{
267-
"key": "default_netweaver_rhel_image"
223+
"key": "powervs_hana_custom_storage_config"
268224
},
269225
{
270-
"key": "default_netweaver_sles_image"
226+
"key": "powervs_hana_additional_storage_config"
271227
},
272228
{
273-
"key": "default_shared_fs_rhel_image"
229+
"key": "powervs_netweaver_storage_config"
274230
},
275231
{
276-
"key": "default_shared_fs_sles_image"
277-
},
232+
"key": "powervs_default_images"
233+
}
234+
],
235+
"outputs": [
278236
{
279-
"key": "sap_hana_additional_storage_config"
237+
"key": "infrastructure_data"
280238
},
281239
{
282-
"key": "sap_hana_custom_storage_config"
240+
"key": "access_host_or_ip"
283241
},
284242
{
285-
"key": "sap_hana_instance_config"
243+
"key": "powervs_hana_instance_ips"
286244
},
287245
{
288-
"key": "sap_netweaver_instance_config"
246+
"key": "powervs_hana_instance_management_ip"
289247
},
290248
{
291-
"key": "sap_netweaver_storage_config"
249+
"key": "powervs_netweaver_instance_ips"
292250
},
293251
{
294-
"key": "sap_share_instance_config"
252+
"key": "powervs_netweaver_instance_management_ips"
295253
},
296254
{
297-
"key": "sap_share_storage_config"
298-
}
299-
],
300-
"outputs": [
301-
{
302-
"key": "share_fs_ips"
255+
"key": "powervs_share_fs_ips"
303256
},
304257
{
305258
"key": "powervs_lpars_data"
306-
},
307-
{
308-
"key": "infrastructure_data"
309-
},
310-
{
311-
"key": "access_host_or_ip"
312-
},
313-
{
314-
"key": "hana_ips"
315-
},
316-
{
317-
"key": "netweaver_ips"
318259
}
319260
],
320261
"iam_permissions": [
@@ -343,34 +284,23 @@
343284
"service_name": "power-iaas"
344285
}
345286
],
346-
"dependencies": [
347-
{
348-
"flavors": [
349-
"full-stack",
350-
"extension"
351-
],
352-
"id": "2dd486c7-b317-4aaa-907b-42671485ad96",
353-
"name": "deploy-arch-ibm-pvs-inf",
354-
"version": ">=1.0.0"
355-
}
356-
],
357287
"architecture": {
358288
"features": [
359289
{
360-
"description": "Not installed",
361-
"title": "SAP solution"
290+
"title": "SAP solution",
291+
"description": "Not installed"
362292
},
363293
{
364-
"description": "SAP HANA Instance: One\n\nSAP NetWeaver Instances: 0,1..N\n\nShared SAP Instance: 0 or 1",
365-
"title": "PowerVS instances"
294+
"title": "PowerVS instances",
295+
"description": "SAP HANA Instance: One\n\nSAP NetWeaver Instances: 0,1..N\n\nShared SAP Instance: 0 or 1"
366296
},
367297
{
368-
"description": "Available",
369-
"title": "Power Virtual Server with VPC landing zone"
298+
"title": "Power Virtual Server with VPC landing zone",
299+
"description": "Available"
370300
},
371301
{
372-
"description": "Available",
373-
"title": "Secure infrastructure on VPC for regulated industries"
302+
"title": "Secure infrastructure on VPC for regulated industries",
303+
"description": "Available"
374304
}
375305
],
376306
"diagrams": [

0 commit comments

Comments
 (0)