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
IBM · May 24, 2024 · 39330e1 · 39330e1
1 parent 5aff9f7
commit 39330e1
Show file tree

Hide file tree

Showing 8 changed files with 174 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Upgrade Notes
 
 - Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan
+- Updated AIX stock images and removed deprecated images for all templates with invalid image references
 
 ### Features
 

diff --git a/client/src/lib/docs/release-notes.json b/client/src/lib/docs/release-notes.json
@@ -14,7 +14,8 @@
       "Power VS Images are now reset when changing zones or changing the name of an existing workspace"
     ],
     "upgrade_notes": [
-      "Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan"
+      "Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan",
+      "Updated AIX stock images and removed deprecated images for all templates with invalid image references"
     ]
   },
   {

diff --git a/client/src/lib/docs/templates/oracle-rac.json b/client/src/lib/docs/templates/oracle-rac.json
@@ -11,12 +11,13 @@
     "dynamic_subnets": false,
     "enable_power_vs": true,
     "power_vs_zones": ["dal12", "dal10", "us-south"],
-    "craig_version": "1.10.0",
+    "craig_version": "1.15.6",
     "power_vs_high_availability": false,
     "no_vpn_secrets_manager_auth": false,
     "power_vs_ha_zone_1": null,
     "power_vs_ha_zone_2": null,
-    "manual_power_vsi_naming": false
+    "manual_power_vsi_naming": false,
+    "template": "Power VS Oracle Ready"
   },
   "access_groups": [],
   "appid": [],
@@ -36,12 +37,19 @@
   },
   "cbr_rules": [],
   "cbr_zones": [],
+  "cis": [],
+  "cis_glbs": [],
+  "classic_bare_metal": [],
+  "classic_gateways": [],
+  "classic_security_groups": [],
   "classic_ssh_keys": [],
   "classic_vlans": [],
+  "classic_vsi": [],
   "clusters": [],
   "dns": [],
   "event_streams": [],
   "f5_vsi": [],
+  "fortigate_vnf": [],
   "iam_account_settings": {
     "enable": false,
     "mfa": null,
@@ -250,23 +258,23 @@
       "cloud_connections": [],
       "images": [
         {
-          "name": "7300-00-01",
+          "name": "7300-02-01",
           "workspace": "oracle-template",
           "zone": "dal12",
-          "pi_image_id": "2cf98f53-433d-4c7a-bc46-1f2dfcc04066",
+          "pi_image_id": "dd13124c-1212-4b25-a2aa-17dabc040eaa",
           "workspace_use_data": false
         }
       ],
       "attachments": [],
-      "imageNames": ["7300-00-01"],
+      "imageNames": ["7300-02-01"],
       "use_data": false
     }
   ],
   "power_instances": [
     {
       "name": "oracle-1",
       "workspace": "oracle-template",
-      "image": "7300-00-01",
+      "image": "7300-02-01",
       "network": [
         {
           "name": "oracle-private-1",
@@ -306,12 +314,13 @@
       "pi_ibmi_rds_users": null,
       "pi_user_data": null,
       "pi_pin_policy": "none",
-      "pi_license_repository_capacity": null
+      "pi_license_repository_capacity": null,
+      "index": 0
     },
     {
       "name": "oracle-2",
       "workspace": "oracle-template",
-      "image": "7300-00-01",
+      "image": "7300-02-01",
       "network": [
         {
           "name": "oracle-private-1",
@@ -351,7 +360,8 @@
       "pi_ibmi_rds_users": null,
       "pi_user_data": null,
       "pi_pin_policy": "none",
-      "pi_license_repository_capacity": null
+      "pi_license_repository_capacity": null,
+      "index": 1
     }
   ],
   "power_volumes": [
@@ -373,7 +383,8 @@
       "pi_affinity_instance": "oracle-1",
       "pi_volume_pool": null,
       "pi_affinity_volume": null,
-      "count": null
+      "count": null,
+      "index": 0
     },
     {
       "name": "oracle-1-db-2",
@@ -393,7 +404,8 @@
       "pi_affinity_instance": "oracle-1",
       "pi_volume_pool": null,
       "pi_affinity_volume": null,
-      "count": null
+      "count": null,
+      "index": 1
     },
     {
       "name": "oracle-2-db-1",
@@ -413,7 +425,8 @@
       "pi_affinity_instance": "oracle-2",
       "pi_volume_pool": null,
       "pi_affinity_volume": null,
-      "count": null
+      "count": null,
+      "index": 2
     },
     {
       "name": "oracle-2-db-2",
@@ -433,7 +446,8 @@
       "pi_affinity_instance": "oracle-2",
       "pi_volume_pool": null,
       "pi_affinity_volume": null,
-      "count": null
+      "count": null,
+      "index": 3
     },
     {
       "name": "redo-1",
@@ -452,7 +466,8 @@
       "pi_affinity_instance": null,
       "pi_anti_affinity_volume": null,
       "pi_anti_affinity_instance": null,
-      "count": null
+      "count": null,
+      "index": 4
     },
     {
       "name": "redo-2",
@@ -471,7 +486,8 @@
       "pi_affinity_instance": null,
       "pi_anti_affinity_volume": null,
       "pi_anti_affinity_instance": null,
-      "count": null
+      "count": null,
+      "index": 5
     },
     {
       "name": "asm-data-1",
@@ -491,7 +507,8 @@
       "pi_anti_affinity_volume": null,
       "pi_anti_affinity_instance": null,
       "pi_volume_pool": null,
-      "count": null
+      "count": null,
+      "index": 6
     },
     {
       "name": "asm-data-2",
@@ -510,7 +527,8 @@
       "pi_affinity_instance": null,
       "pi_anti_affinity_volume": null,
       "pi_anti_affinity_instance": null,
-      "count": null
+      "count": null,
+      "index": 7
     },
     {
       "name": "management",
@@ -529,7 +547,8 @@
       "pi_affinity_instance": null,
       "pi_anti_affinity_volume": null,
       "pi_anti_affinity_instance": null,
-      "count": null
+      "count": null,
+      "index": 8
     },
     {
       "name": "vote-1",
@@ -549,7 +568,8 @@
       "pi_affinity_instance": "oracle-1",
       "pi_volume_pool": null,
       "pi_affinity_volume": null,
-      "count": null
+      "count": null,
+      "index": 9
     },
     {
       "name": "vote-2",
@@ -569,7 +589,8 @@
       "pi_affinity_instance": "oracle-1",
       "pi_volume_pool": null,
       "pi_affinity_volume": null,
-      "count": null
+      "count": null,
+      "index": 10
     },
     {
       "name": "vote-3",
@@ -589,7 +610,8 @@
       "pi_affinity_instance": "oracle-1",
       "pi_volume_pool": null,
       "pi_affinity_volume": null,
-      "count": null
+      "count": null,
+      "index": 11
     }
   ],
   "resource_groups": [
@@ -626,6 +648,17 @@
     "scope_description": null,
     "enable": false
   },
+  "scc_v2": {
+    "enable": false,
+    "resource_group": null,
+    "region": null,
+    "account_id": "${var.account_id}",
+    "profile_attachments": [],
+    "name": null,
+    "use_cos": false,
+    "cos": null,
+    "bucket": null
+  },
   "secrets_manager": [],
   "security_groups": [
     {
@@ -1720,7 +1753,7 @@
     {
       "kms": "kms",
       "encryption_key": "vsi-volume-key",
-      "image": "ibm-ubuntu-22-04-1-minimal-amd64-1",
+      "image": "ibm-ubuntu-22-04-4-minimal-amd64-1",
       "profile": "cx2-4x8",
       "name": "management-server",
       "security_groups": ["management-vsi"],
@@ -1733,7 +1766,7 @@
       "user_data": null,
       "network_interfaces": [],
       "volumes": [],
-      "image_name": null,
+      "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]",
       "enable_floating_ip": false,
       "primary_interface_ip_spoofing": false,
       "use_variable_names": false,
@@ -1749,8 +1782,7 @@
     {
       "kms": "kms",
       "encryption_key": "vsi-volume-key",
-      "image": "ibm-ubuntu-22-04-3-minimal-amd64-1",
-      "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-3-minimal-amd64-1]",
+      "image": "ibm-ubuntu-22-04-4-minimal-amd64-1",
       "profile": "bx2-2x8",
       "name": "workload-server",
       "security_groups": ["workload-vpe"],
@@ -1763,6 +1795,7 @@
       "network_interfaces": [],
       "subnets": ["vsi-zone-1", "vsi-zone-2", "vsi-zone-3"],
       "volumes": [],
+      "image_name": "Ubuntu Linux 22.04 LTS Jammy Jellyfish Minimal Install (amd64) [ibm-ubuntu-22-04-4-minimal-amd64-1]",
       "subnet": "",
       "enable_floating_ip": false,
       "primary_interface_ip_spoofing": false,
@@ -1772,5 +1805,6 @@
       "reserved_ips": [[""], [""], [""]],
       "enable_static_ips": false
     }
-  ]
+  ],
+  "vtl": []
 }