fix: update the default VSI image name to ibm-ubuntu-24-04-minimal-amd64-4 (#861)

terraform-ibm-modules-ops · ocofaigh · web-flow · commit 9fe2a939c984 · 2024-08-27T14:14:48.000+01:00
Co-authored-by: Conall Ó Cofaigh &lt;ocofaigh@ie.ibm.com&gt;
diff --git a/examples/one-vpc-one-vsi/override.json b/examples/one-vpc-one-vsi/override.json
@@ -151,7 +151,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
       "machine_type": "cx2-2x4",
       "name": "jump-box",
       "resource_group": "slz-management-rg",
diff --git a/examples/override-example/override.json b/examples/override-example/override.json
@@ -387,7 +387,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
       "machine_type": "cx2-2x4",
       "name": "jump-box",
       "resource_group": "slz-management-rg",
@@ -420,7 +420,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
       "machine_type": "cx2-2x4",
       "name": "private-svs",
       "resource_group": "slz-workload-rg",
@@ -453,7 +453,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
       "machine_type": "cx2-2x4",
       "name": "inet-svs",
       "resource_group": "slz-edge-rg",
diff --git a/patterns/mixed/override.json b/patterns/mixed/override.json
@@ -404,7 +404,7 @@
     "vsi": [
         {
             "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-            "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+            "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
             "machine_type": "cx2-4x8",
             "name": "management-server",
             "security_group": {
diff --git a/patterns/mixed/variables.tf b/patterns/mixed/variables.tf
@@ -132,7 +132,7 @@ variable "use_random_cos_suffix" {
 variable "vsi_image_name" {
   description = "VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "vsi_instance_profile" {
@@ -476,7 +476,7 @@ variable "teleport_instance_profile" {
 variable "teleport_vsi_image_name" {
   description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "teleport_license" {
diff --git a/patterns/roks/module/variables.tf b/patterns/roks/module/variables.tf
@@ -553,7 +553,7 @@ variable "teleport_instance_profile" {
 variable "teleport_vsi_image_name" {
   description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "teleport_license" {
diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf
@@ -562,7 +562,7 @@ variable "teleport_instance_profile" {
 variable "teleport_vsi_image_name" {
   description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "teleport_license" {
diff --git a/patterns/vpc/module/variables.tf b/patterns/vpc/module/variables.tf
@@ -375,7 +375,7 @@ variable "teleport_instance_profile" {
 variable "teleport_vsi_image_name" {
   description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "teleport_license" {
diff --git a/patterns/vpc/variables.tf b/patterns/vpc/variables.tf
@@ -381,7 +381,7 @@ variable "teleport_instance_profile" {
 variable "teleport_vsi_image_name" {
   description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "teleport_license" {
diff --git a/patterns/vsi-extension/variables.tf b/patterns/vsi-extension/variables.tf
@@ -53,7 +53,7 @@ variable "access_tags" {
 variable "image_name" {
   description = "The image ID used for the VSI. You can run the `ibmcloud is images` CLI command to find available images. The IDs are different in each region."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "vsi_instance_profile" {
diff --git a/patterns/vsi-quickstart/variables.tf b/patterns/vsi-quickstart/variables.tf
@@ -231,7 +231,7 @@ variable "override_json_string" {
    "vsi": [
       {
          "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-         "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+         "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
          "machine_type": "cx2-4x8",
          "name": "jump-box",
          "resource_group": "management-rg",
@@ -276,7 +276,7 @@ variable "override_json_string" {
       },
       {
          "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-         "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+         "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
          "machine_type": "cx2-4x8",
          "name": "workload-server",
          "resource_group": "workload-rg",
diff --git a/patterns/vsi/module/variables.tf b/patterns/vsi/module/variables.tf
@@ -125,7 +125,7 @@ variable "use_random_cos_suffix" {
 variable "vsi_image_name" {
   description = "VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "vsi_instance_profile" {
@@ -407,7 +407,7 @@ variable "teleport_instance_profile" {
 variable "teleport_vsi_image_name" {
   description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "teleport_license" {
diff --git a/patterns/vsi/override.json b/patterns/vsi/override.json
@@ -362,7 +362,7 @@
     "vsi": [
         {
             "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-            "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+            "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
             "machine_type": "cx2-4x8",
             "name": "management-server",
             "security_group": {
@@ -426,7 +426,7 @@
         },
         {
             "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-            "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",
+            "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
             "machine_type": "cx2-4x8",
             "name": "workload-server",
             "security_group": {
diff --git a/patterns/vsi/variables.tf b/patterns/vsi/variables.tf
@@ -131,7 +131,7 @@ variable "use_random_cos_suffix" {
 variable "vsi_image_name" {
   description = "VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "vsi_instance_profile" {
@@ -413,7 +413,7 @@ variable "teleport_instance_profile" {
 variable "teleport_vsi_image_name" {
   description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
   type        = string
-  default     = "ibm-ubuntu-24-04-minimal-amd64-2"
+  default     = "ibm-ubuntu-24-04-minimal-amd64-4"
 }
 
 variable "teleport_license" {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@`
`151`	`151`	`{`
`152`	`152`	`"access_tags": [],`
`153`	`153`	`"boot_volume_encryption_key_name": "slz-vsi-volume-key",`
`154`		`- "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",`
	`154`	`+ "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",`
`155`	`155`	`"machine_type": "cx2-2x4",`
`156`	`156`	`"name": "jump-box",`
`157`	`157`	`"resource_group": "slz-management-rg",`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@`
`404`	`404`	`"vsi": [`
`405`	`405`	`{`
`406`	`406`	`"boot_volume_encryption_key_name": "slz-vsi-volume-key",`
`407`		`- "image_name": "ibm-ubuntu-24-04-minimal-amd64-2",`
	`407`	`+ "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",`
`408`	`408`	`"machine_type": "cx2-4x8",`
`409`	`409`	`"name": "management-server",`
`410`	`410`	`"security_group": {`
Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@ variable "teleport_instance_profile" {`
`553`	`553`	`variable "teleport_vsi_image_name" {`
`554`	`554`	description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
`555`	`555`	`type = string`
`556`		`- default = "ibm-ubuntu-24-04-minimal-amd64-2"`
	`556`	`+ default = "ibm-ubuntu-24-04-minimal-amd64-4"`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`variable "teleport_license" {`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ variable "teleport_instance_profile" {`
`562`	`562`	`variable "teleport_vsi_image_name" {`
`563`	`563`	description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
`564`	`564`	`type = string`
`565`		`- default = "ibm-ubuntu-24-04-minimal-amd64-2"`
	`565`	`+ default = "ibm-ubuntu-24-04-minimal-amd64-4"`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`variable "teleport_license" {`
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ variable "teleport_instance_profile" {`
`375`	`375`	`variable "teleport_vsi_image_name" {`
`376`	`376`	description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
`377`	`377`	`type = string`
`378`		`- default = "ibm-ubuntu-24-04-minimal-amd64-2"`
	`378`	`+ default = "ibm-ubuntu-24-04-minimal-amd64-4"`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`variable "teleport_license" {`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ variable "teleport_instance_profile" {`
`381`	`381`	`variable "teleport_vsi_image_name" {`
`382`	`382`	description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
`383`	`383`	`type = string`
`384`		`- default = "ibm-ubuntu-24-04-minimal-amd64-2"`
	`384`	`+ default = "ibm-ubuntu-24-04-minimal-amd64-4"`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`variable "teleport_license" {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ variable "access_tags" {`
`53`	`53`	`variable "image_name" {`
`54`	`54`	description = "The image ID used for the VSI. You can run the `ibmcloud is images` CLI command to find available images. The IDs are different in each region."
`55`	`55`	`type = string`
`56`		`- default = "ibm-ubuntu-24-04-minimal-amd64-2"`
	`56`	`+ default = "ibm-ubuntu-24-04-minimal-amd64-4"`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`variable "vsi_instance_profile" {`