fix: update the default VSI image name to ibm-ubuntu-24-04-6-minimal-amd64-1 (#882)

terraform-ibm-modules-ops · ocofaigh · web-flow · commit 0bf1957b49f0 · 2024-09-26T17:04:50.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
@@ -152,7 +152,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
+      "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
       "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
@@ -390,7 +390,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
+      "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
       "machine_type": "cx2-2x4",
       "name": "jump-box",
       "resource_group": "slz-management-rg",
@@ -423,7 +423,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
+      "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
       "machine_type": "cx2-2x4",
       "name": "private-svs",
       "resource_group": "slz-workload-rg",
@@ -456,7 +456,7 @@
     {
       "access_tags": [],
       "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-      "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
+      "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
       "machine_type": "cx2-2x4",
       "name": "inet-svs",
       "resource_group": "slz-edge-rg",
diff --git a/patterns/mixed/override.json b/patterns/mixed/override.json
@@ -406,7 +406,7 @@
     "vsi": [
         {
             "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-            "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
+            "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
             "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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 variable "vsi_instance_profile" {
@@ -489,7 +489,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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 variable "teleport_license" {
diff --git a/patterns/roks/module/variables.tf b/patterns/roks/module/variables.tf
@@ -573,7 +573,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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 variable "teleport_license" {
diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf
@@ -590,7 +590,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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 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-4",
+         "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
          "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-4",
+         "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
          "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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 variable "teleport_license" {
diff --git a/patterns/vsi/override.json b/patterns/vsi/override.json
@@ -363,7 +363,7 @@
     "vsi": [
         {
             "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-            "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
+            "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
             "machine_type": "cx2-4x8",
             "name": "management-server",
             "security_group": {
@@ -427,7 +427,7 @@
         },
         {
             "boot_volume_encryption_key_name": "slz-vsi-volume-key",
-            "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",
+            "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",
             "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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 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-4"
+  default     = "ibm-ubuntu-24-04-6-minimal-amd64-1"
 }
 
 variable "teleport_license" {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@`
`152`	`152`	`{`
`153`	`153`	`"access_tags": [],`
`154`	`154`	`"boot_volume_encryption_key_name": "slz-vsi-volume-key",`
`155`		`- "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",`
	`155`	`+ "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",`
`156`	`156`	`"machine_type": "cx2-2x4",`
`157`	`157`	`"name": "jump-box",`
`158`	`158`	`"resource_group": "slz-management-rg",`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@`
`406`	`406`	`"vsi": [`
`407`	`407`	`{`
`408`	`408`	`"boot_volume_encryption_key_name": "slz-vsi-volume-key",`
`409`		`- "image_name": "ibm-ubuntu-24-04-minimal-amd64-4",`
	`409`	`+ "image_name": "ibm-ubuntu-24-04-6-minimal-amd64-1",`
`410`	`410`	`"machine_type": "cx2-4x8",`
`411`	`411`	`"name": "management-server",`
`412`	`412`	`"security_group": {`
Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ variable "teleport_instance_profile" {`
`573`	`573`	`variable "teleport_vsi_image_name" {`
`574`	`574`	description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
`575`	`575`	`type = string`
`576`		`- default = "ibm-ubuntu-24-04-minimal-amd64-4"`
	`576`	`+ default = "ibm-ubuntu-24-04-6-minimal-amd64-1"`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`variable "teleport_license" {`
Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ variable "teleport_instance_profile" {`
`590`	`590`	`variable "teleport_vsi_image_name" {`
`591`	`591`	description = "Teleport VSI image name. Use the IBM Cloud CLI command `ibmcloud is images` to see availabled images."
`592`	`592`	`type = string`
`593`		`- default = "ibm-ubuntu-24-04-minimal-amd64-4"`
	`593`	`+ default = "ibm-ubuntu-24-04-6-minimal-amd64-1"`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`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-4"`
	`378`	`+ default = "ibm-ubuntu-24-04-6-minimal-amd64-1"`
`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-4"`
	`384`	`+ default = "ibm-ubuntu-24-04-6-minimal-amd64-1"`
`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-4"`
	`56`	`+ default = "ibm-ubuntu-24-04-6-minimal-amd64-1"`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`variable "vsi_instance_profile" {`