Skip to content

Commit 2a7d7e1

Browse files
surajsbharadwajsurajsbharadwaj
committed
Revert "refactor: vars"
This reverts commit 5198c78.
1 parent 5198c78 commit 2a7d7e1

File tree

8 files changed

+188
-250
lines changed

8 files changed

+188
-250
lines changed

‎.secrets.baseline‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,26 @@
107107
"verified_result": null
108108
}
109109
],
110+
"solutions/sap-ready-to-go/README.md": [
111+
{
112+
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
113+
"is_secret": false,
114+
"is_verified": false,
115+
"line_number": 60,
116+
"type": "Secret Keyword",
117+
"verified_result": null
118+
}
119+
],
120+
"solutions/sap-ready-to-go/input.tfvars": [
121+
{
122+
"hashed_secret": "4d82fc4e8ef3a90cebdf3a1fc0e4abab79a41391",
123+
"is_secret": false,
124+
"is_verified": false,
125+
"line_number": 18,
126+
"type": "Secret Keyword",
127+
"verified_result": null
128+
}
129+
],
110130
"tests/pr_test.go": [
111131
{
112132
"hashed_secret": "c7c6508b19455e3e8040e60e9833fbede92e5d8e",

‎ibm_catalog.json‎

Lines changed: 45 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,40 @@
4949
{
5050
"label": "SAP ready PowerVS",
5151
"name": "sap-ready-to-go",
52-
"install_type": "fullstack",
52+
"install_type": "extension",
5353
"working_directory": "solutions/ibm-catalog/sap-ready-to-go",
5454
"compliance": {
5555
"authority": "",
5656
"profiles": []
5757
},
58+
"dependencies": [
59+
{
60+
"flavors": [
61+
"standard",
62+
"standard-extend"
63+
],
64+
"id": "2dd486c7-b317-4aaa-907b-42671485ad96-global",
65+
"name": "deploy-arch-ibm-pvs-inf",
66+
"install_type": "fullstack",
67+
"optional": true,
68+
"version": ">=8.0.0"
69+
}
70+
],
5871
"configuration": [
72+
{
73+
"key": "prerequisite_workspace_id",
74+
"required": true,
75+
"custom_config": {
76+
"config_constraints": {
77+
"catalogID": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc",
78+
"offeringID": "2dd486c7-b317-4aaa-907b-42671485ad96-global",
79+
"versionConstraint": ">=8.0.0"
80+
},
81+
"grouping": "deployment",
82+
"original_grouping": "deployment",
83+
"type": "schematics_workspace"
84+
}
85+
},
5986
{
6087
"key": "powervs_zone",
6188
"type": "string",
@@ -137,19 +164,6 @@
137164
],
138165
"custom_config": {}
139166
},
140-
{
141-
"key": "powervs_resource_group_name",
142-
"required": true,
143-
"default_value": "",
144-
"custom_config": {
145-
"config_constraints": {
146-
"identifier": "rg_name"
147-
},
148-
"grouping": "deployment",
149-
"original_grouping": "deployment",
150-
"type": "resource_group"
151-
}
152-
},
153167
{
154168
"key": "prefix",
155169
"required": true,
@@ -188,26 +202,6 @@
188202
"key": "powervs_netweaver_memory_size",
189203
"required": true
190204
},
191-
{
192-
"key": "external_access_ip",
193-
"default_value": "__NULL__",
194-
"required": true
195-
},
196-
{
197-
"key": "powervs_sap_network_cidr",
198-
"required": true
199-
},
200-
{
201-
"key": "ssh_public_key",
202-
"type": "multiline_secure_value",
203-
"display_name": "ssh_public_key",
204-
"required": true,
205-
"custom_config": {
206-
"grouping": "deployment",
207-
"original_grouping": "deployment",
208-
"type": "multiline_secure_value"
209-
}
210-
},
211205
{
212206
"key": "ssh_private_key",
213207
"type": "multiline_secure_value",
@@ -231,36 +225,20 @@
231225
}
232226
},
233227
{
234-
"key": "client_to_site_vpn",
235-
"required": true
228+
"key": "sap_domain"
236229
},
237230
{
238-
"key": "sap_domain",
239-
"required": true
240-
},
241-
{
242-
"key": "enable_monitoring",
243-
"required": true
231+
"key": "nfs_directory",
232+
"hidden": true
244233
},
245234
{
246-
"key": "enable_scc_wp",
247-
"required": true
235+
"key": "powervs_sap_network_cidr"
248236
},
249237
{
250-
"key": "nfs_server_config",
251-
"required": true
238+
"key": "powervs_hana_instance_name"
252239
},
253240
{
254-
"key": "ansible_vault_password",
255-
"type": "multiline_secure_value",
256-
"required": true,
257-
"default_value": "__NULL__",
258-
"display_name": "ansible_vault_password",
259-
"custom_config": {
260-
"grouping": "deployment",
261-
"original_grouping": "deployment",
262-
"type": "multiline_secure_value"
263-
}
241+
"key": "powervs_netweaver_instance_name"
264242
},
265243
{
266244
"key": "powervs_hana_instance_custom_storage_config",
@@ -286,14 +264,6 @@
286264
"type": "code_editor"
287265
}
288266
},
289-
{
290-
"key": "vpc_intel_images",
291-
"custom_config": {
292-
"grouping": "deployment",
293-
"original_grouping": "deployment",
294-
"type": "code_editor"
295-
}
296-
},
297267
{
298268
"key": "powervs_default_sap_images",
299269
"custom_config": {
@@ -316,101 +286,37 @@
316286
}
317287
},
318288
{
319-
"key": "powervs_custom_images",
320-
"custom_config": {
321-
"grouping": "deployment",
322-
"original_grouping": "deployment",
323-
"type": "code_editor"
324-
}
325-
},
326-
{
327-
"key": "powervs_custom_image_cos_configuration",
328-
"custom_config": {
329-
"grouping": "deployment",
330-
"original_grouping": "deployment",
331-
"type": "code_editor"
332-
}
333-
},
334-
{
335-
"key": "powervs_custom_image_cos_service_credentials",
289+
"key": "ansible_vault_password",
336290
"type": "multiline_secure_value",
337291
"display_name": "ansible_vault_password",
338292
"custom_config": {
339293
"grouping": "deployment",
340294
"original_grouping": "deployment",
341295
"type": "multiline_secure_value"
342296
}
343-
},
297+
}
298+
],
299+
"outputs": [
344300
{
345-
"key": "tags",
346-
"custom_config": {
347-
"grouping": "deployment",
348-
"original_grouping": "deployment",
349-
"type": "code_editor"
350-
}
301+
"key": "infrastructure_data"
351302
},
352303
{
353-
"key": "existing_monitoring_instance_crn"
304+
"key": "access_host_or_ip"
354305
},
355306
{
356-
"key": "sm_service_plan"
307+
"key": "powervs_hana_instance_ips"
357308
},
358309
{
359-
"key": "existing_sm_instance_guid"
310+
"key": "powervs_hana_instance_management_ip"
360311
},
361312
{
362-
"key": "existing_sm_instance_region",
363-
"type": "string",
364-
"default_value": "__NULL__",
365-
"options": [
366-
{
367-
"displayname": "Null",
368-
"value": "__NULL__"
369-
},
370-
{
371-
"displayname": "au-syd",
372-
"value": "au-syd"
373-
},
374-
{
375-
"displayname": "br-sao",
376-
"value": "br-sao"
377-
},
378-
{
379-
"displayname": "ca-tor",
380-
"value": "ca-tor"
381-
},
382-
{
383-
"displayname": "eu-de",
384-
"value": "eu-de"
385-
},
386-
{
387-
"displayname": "eu-gb",
388-
"value": "eu-gb"
389-
},
390-
{
391-
"displayname": "jp-osa",
392-
"value": "jp-osa"
393-
},
394-
{
395-
"displayname": "jp-tok",
396-
"value": "jp-tok"
397-
},
398-
{
399-
"displayname": "us-east",
400-
"value": "us-east"
401-
},
402-
{
403-
"displayname": "us-south",
404-
"value": "us-south"
405-
}
406-
],
407-
"custom_config": {}
313+
"key": "powervs_netweaver_instance_ips"
408314
},
409315
{
410-
"key": "powervs_management_network"
316+
"key": "powervs_netweaver_instance_management_ips"
411317
},
412318
{
413-
"key": "powervs_backup_network"
319+
"key": "powervs_lpars_data"
414320
}
415321
],
416322
"iam_permissions": [

‎modules/pi-sap-system-type1/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ The Power Virtual Server for SAP module automates the following tasks:
3232
| <a name="module_ansible_pi_netweaver_secondary_instances_sapmnt_mount"></a> [ansible\_pi\_netweaver\_secondary\_instances\_sapmnt\_mount](#module\_ansible\_pi\_netweaver\_secondary\_instances\_sapmnt\_mount) | ../ansible | n/a |
3333
| <a name="module_ansible_sap_instance_init"></a> [ansible\_sap\_instance\_init](#module\_ansible\_sap\_instance\_init) | ../ansible | n/a |
3434
| <a name="module_configure_scc_wp_agent"></a> [configure\_scc\_wp\_agent](#module\_configure\_scc\_wp\_agent) | ../ansible | n/a |
35-
| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.8.0 |
35+
| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.7.0 |
3636
| <a name="module_pi_hana_storage_calculation"></a> [pi\_hana\_storage\_calculation](#module\_pi\_hana\_storage\_calculation) | ../pi-hana-storage-config | n/a |
37-
| <a name="module_pi_netweaver_primary_instance"></a> [pi\_netweaver\_primary\_instance](#module\_pi\_netweaver\_primary\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.8.0 |
38-
| <a name="module_pi_netweaver_secondary_instances"></a> [pi\_netweaver\_secondary\_instances](#module\_pi\_netweaver\_secondary\_instances) | terraform-ibm-modules/powervs-instance/ibm | 2.8.0 |
37+
| <a name="module_pi_netweaver_primary_instance"></a> [pi\_netweaver\_primary\_instance](#module\_pi\_netweaver\_primary\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.7.0 |
38+
| <a name="module_pi_netweaver_secondary_instances"></a> [pi\_netweaver\_secondary\_instances](#module\_pi\_netweaver\_secondary\_instances) | terraform-ibm-modules/powervs-instance/ibm | 2.7.0 |
3939

4040
### Resources
4141

0 commit comments

Comments
 (0)