Skip to content

Commit 39330e1

Browse files
Ay1man2GitHub Enterprise
Ay1man2
authored and
GitHub Enterprise
committed
Issue 1944: Updated deprecated AIX Stock Images in templates (#1945)
* updated all templates to remove deprecated images, replaced depracted AIX images * update changelog + prettier formatting * added missing VSI images, removed depends on from networks for oracle-rac, updated AIX images to latest version
1 parent 5aff9f7 commit 39330e1

File tree

8 files changed

+174
-124
lines changed

8 files changed

+174
-124
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
77
### Upgrade Notes
88

99
- Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan
10+
- Updated AIX stock images and removed deprecated images for all templates with invalid image references
1011

1112
### Features
1213

‎client/src/lib/docs/release-notes.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"Power VS Images are now reset when changing zones or changing the name of an existing workspace"
1515
],
1616
"upgrade_notes": [
17-
"Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan"
17+
"Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan",
18+
"Updated AIX stock images and removed deprecated images for all templates with invalid image references"
1819
]
1920
},
2021
{

‎client/src/lib/docs/templates/oracle-rac.json

Lines changed: 60 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
"dynamic_subnets": false,
1212
"enable_power_vs": true,
1313
"power_vs_zones": ["dal12", "dal10", "us-south"],
14-
"craig_version": "1.10.0",
14+
"craig_version": "1.15.6",
1515
"power_vs_high_availability": false,
1616
"no_vpn_secrets_manager_auth": false,
1717
"power_vs_ha_zone_1": null,
1818
"power_vs_ha_zone_2": null,
19-
"manual_power_vsi_naming": false
19+
"manual_power_vsi_naming": false,
20+
"template": "Power VS Oracle Ready"
2021
},
2122
"access_groups": [],
2223
"appid": [],
@@ -36,12 +37,19 @@
3637
},
3738
"cbr_rules": [],
3839
"cbr_zones": [],
40+
"cis": [],
41+
"cis_glbs": [],
42+
"classic_bare_metal": [],
43+
"classic_gateways": [],
44+
"classic_security_groups": [],
3945
"classic_ssh_keys": [],
4046
"classic_vlans": [],
47+
"classic_vsi": [],
4148
"clusters": [],
4249
"dns": [],
4350
"event_streams": [],
4451
"f5_vsi": [],
52+
"fortigate_vnf": [],
4553
"iam_account_settings": {
4654
"enable": false,
4755
"mfa": null,
@@ -250,23 +258,23 @@
250258
"cloud_connections": [],
251259
"images": [
252260
{
253-
"name": "7300-00-01",
261+
"name": "7300-02-01",
254262
"workspace": "oracle-template",
255263
"zone": "dal12",
256-
"pi_image_id": "2cf98f53-433d-4c7a-bc46-1f2dfcc04066",
264+
"pi_image_id": "dd13124c-1212-4b25-a2aa-17dabc040eaa",
257265
"workspace_use_data": false
258266
}
259267
],
260268
"attachments": [],
261-
"imageNames": ["7300-00-01"],
269+
"imageNames": ["7300-02-01"],
262270
"use_data": false
263271
}
264272
],
265273
"power_instances": [
266274
{
267275
"name": "oracle-1",
268276
"workspace": "oracle-template",
269-
"image": "7300-00-01",
277+
"image": "7300-02-01",
270278
"network": [
271279
{
272280
"name": "oracle-private-1",
@@ -306,12 +314,13 @@
306314
"pi_ibmi_rds_users": null,
307315
"pi_user_data": null,
308316
"pi_pin_policy": "none",
309-
"pi_license_repository_capacity": null
317+
"pi_license_repository_capacity": null,
318+
"index": 0
310319
},
311320
{
312321
"name": "oracle-2",
313322
"workspace": "oracle-template",
314-
"image": "7300-00-01",
323+
"image": "7300-02-01",
315324
"network": [
316325
{
317326
"name": "oracle-private-1",
@@ -351,7 +360,8 @@
351360
"pi_ibmi_rds_users": null,
352361
"pi_user_data": null,
353362
"pi_pin_policy": "none",
354-
"pi_license_repository_capacity": null
363+
"pi_license_repository_capacity": null,
364+
"index": 1
355365
}
356366
],
357367
"power_volumes": [
@@ -373,7 +383,8 @@
373383
"pi_affinity_instance": "oracle-1",
374384
"pi_volume_pool": null,
375385
"pi_affinity_volume": null,
376-
"count": null
386+
"count": null,
387+
"index": 0
377388
},
378389
{
379390
"name": "oracle-1-db-2",
@@ -393,7 +404,8 @@
393404
"pi_affinity_instance": "oracle-1",
394405
"pi_volume_pool": null,
395406
"pi_affinity_volume": null,
396-
"count": null
407+
"count": null,
408+
"index": 1
397409
},
398410
{
399411
"name": "oracle-2-db-1",
@@ -413,7 +425,8 @@
413425
"pi_affinity_instance": "oracle-2",
414426
"pi_volume_pool": null,
415427
"pi_affinity_volume": null,
416-
"count": null
428+
"count": null,
429+
"index": 2
417430
},
418431
{
419432
"name": "oracle-2-db-2",
@@ -433,7 +446,8 @@
433446
"pi_affinity_instance": "oracle-2",
434447
"pi_volume_pool": null,
435448
"pi_affinity_volume": null,
436-
"count": null
449+
"count": null,
450+
"index": 3
437451
},
438452
{
439453
"name": "redo-1",
@@ -452,7 +466,8 @@
452466
"pi_affinity_instance": null,
453467
"pi_anti_affinity_volume": null,
454468
"pi_anti_affinity_instance": null,
455-
"count": null
469+
"count": null,
470+
"index": 4
456471
},
457472
{
458473
"name": "redo-2",
@@ -471,7 +486,8 @@
471486
"pi_affinity_instance": null,
472487
"pi_anti_affinity_volume": null,
473488
"pi_anti_affinity_instance": null,
474-
"count": null
489+
"count": null,
490+
"index": 5
475491
},
476492
{
477493
"name": "asm-data-1",
@@ -491,7 +507,8 @@
491507
"pi_anti_affinity_volume": null,
492508
"pi_anti_affinity_instance": null,
493509
"pi_volume_pool": null,
494-
"count": null
510+
"count": null,
511+
"index": 6
495512
},
496513
{
497514
"name": "asm-data-2",
@@ -510,7 +527,8 @@
510527
"pi_affinity_instance": null,
511528
"pi_anti_affinity_volume": null,
512529
"pi_anti_affinity_instance": null,
513-
"count": null
530+
"count": null,
531+
"index": 7
514532
},
515533
{
516534
"name": "management",
@@ -529,7 +547,8 @@
529547
"pi_affinity_instance": null,
530548
"pi_anti_affinity_volume": null,
531549
"pi_anti_affinity_instance": null,
532-
"count": null
550+
"count": null,
551+
"index": 8
533552
},
534553
{
535554
"name": "vote-1",
@@ -549,7 +568,8 @@
549568
"pi_affinity_instance": "oracle-1",
550569
"pi_volume_pool": null,
551570
"pi_affinity_volume": null,
552-
"count": null
571+
"count": null,
572+
"index": 9
553573
},
554574
{
555575
"name": "vote-2",
@@ -569,7 +589,8 @@
569589
"pi_affinity_instance": "oracle-1",
570590
"pi_volume_pool": null,
571591
"pi_affinity_volume": null,
572-
"count": null
592+
"count": null,
593+
"index": 10
573594
},
574595
{
575596
"name": "vote-3",
@@ -589,7 +610,8 @@
589610
"pi_affinity_instance": "oracle-1",
590611
"pi_volume_pool": null,
591612
"pi_affinity_volume": null,
592-
"count": null
613+
"count": null,
614+
"index": 11
593615
}
594616
],
595617
"resource_groups": [
@@ -626,6 +648,17 @@
626648
"scope_description": null,
627649
"enable": false
628650
},
651+
"scc_v2": {
652+
"enable": false,
653+
"resource_group": null,
654+
"region": null,
655+
"account_id": "${var.account_id}",
656+
"profile_attachments": [],
657+
"name": null,
658+
"use_cos": false,
659+
"cos": null,
660+
"bucket": null
661+
},
629662
"secrets_manager": [],
630663
"security_groups": [
631664
{
@@ -1720,7 +1753,7 @@
17201753
{
17211754
"kms": "kms",
17221755
"encryption_key": "vsi-volume-key",
1723-
"image": "ibm-ubuntu-22-04-1-minimal-amd64-1",
1756+
"image": "ibm-ubuntu-22-04-4-minimal-amd64-1",
17241757
"profile": "cx2-4x8",
17251758
"name": "management-server",
17261759
"security_groups": ["management-vsi"],
@@ -1733,7 +1766,7 @@
17331766
"user_data": null,
17341767
"network_interfaces": [],
17351768
"volumes": [],
1736-
"image_name": null,
1769+
"image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]",
17371770
"enable_floating_ip": false,
17381771
"primary_interface_ip_spoofing": false,
17391772
"use_variable_names": false,
@@ -1749,8 +1782,7 @@
17491782
{
17501783
"kms": "kms",
17511784
"encryption_key": "vsi-volume-key",
1752-
"image": "ibm-ubuntu-22-04-3-minimal-amd64-1",
1753-
"image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-3-minimal-amd64-1]",
1785+
"image": "ibm-ubuntu-22-04-4-minimal-amd64-1",
17541786
"profile": "bx2-2x8",
17551787
"name": "workload-server",
17561788
"security_groups": ["workload-vpe"],
@@ -1763,6 +1795,7 @@
17631795
"network_interfaces": [],
17641796
"subnets": ["vsi-zone-1", "vsi-zone-2", "vsi-zone-3"],
17651797
"volumes": [],
1798+
"image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]",
17661799
"subnet": "",
17671800
"enable_floating_ip": false,
17681801
"primary_interface_ip_spoofing": false,
@@ -1772,5 +1805,6 @@
17721805
"reserved_ips": [[""], [""], [""]],
17731806
"enable_static_ips": false
17741807
}
1775-
]
1808+
],
1809+
"vtl": []
17761810
}

0 commit comments

Comments
 (0)