pushing missing code

AmpereComputing · Oct 8, 2024 · 07c061f · 07c061f
1 parent bcae28a
commit 07c061f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 141 deletions.
diff --git a/archive/examples/ubuntu1804/cloud-init.yaml.tpl b/archive/examples/ubuntu1804/cloud-init.yaml.tpl
diff --git a/archive/examples/ubuntu1804/main.tf b/archive/examples/ubuntu1804/main.tf
diff --git a/archive/openmandriva.tf b/archive/openmandriva.tf
diff --git a/centosstream8.tf → centosstream8.tf.off b/centosstream8.tf → centosstream8.tf.off
diff --git a/images.tf b/images.tf
@@ -13,7 +13,7 @@ output "oci_aarch64_images_map" {
       data.oci_core_images.oraclelinux-9-aarch64.images.0.display_name,
       data.oci_core_images.oraclelinux-8-aarch64.images.0.display_name,
       data.oci_core_images.oraclelinux-7_9-aarch64.images.0.display_name,
-      data.oci_core_images.ubuntu-24_04-aarch64.images.0.display_name,
+      #data.oci_core_images.ubuntu-24_04-aarch64.images.0.display_name,
       data.oci_core_images.ubuntu-22_04-aarch64.images.0.display_name,
       data.oci_core_images.ubuntu-20_04-aarch64.images.0.display_name,
       # Ubuntu 18.04 no longer in OCI catalog
@@ -30,7 +30,7 @@ output "oci_aarch64_images_map" {
       data.oci_core_images.oraclelinux-9-aarch64.images.0.id,
       data.oci_core_images.oraclelinux-8-aarch64.images.0.id,
       data.oci_core_images.oraclelinux-7_9-aarch64.images.0.id,
-      data.oci_core_images.ubuntu-24_04-aarch64.images.0.id,
+      #data.oci_core_images.ubuntu-24_04-aarch64.images.0.id,
       data.oci_core_images.ubuntu-22_04-aarch64.images.0.id,
       data.oci_core_images.ubuntu-20_04-aarch64.images.0.id,
       # Ubuntu 18.04 no longer in OCI catalog
@@ -52,7 +52,7 @@ locals {
       data.oci_core_images.oraclelinux-9-aarch64.images.0.display_name,
       data.oci_core_images.oraclelinux-8-aarch64.images.0.display_name,
       data.oci_core_images.oraclelinux-7_9-aarch64.images.0.display_name,
-      data.oci_core_images.ubuntu-24_04-aarch64.images.0.display_name,
+      #data.oci_core_images.ubuntu-24_04-aarch64.images.0.display_name,
       data.oci_core_images.ubuntu-22_04-aarch64.images.0.display_name,
       data.oci_core_images.ubuntu-20_04-aarch64.images.0.display_name,
       # Ubuntu 18.04 no longer in OCI catalog
@@ -69,7 +69,7 @@ locals {
       data.oci_core_images.oraclelinux-9-aarch64.images.0.id,
       data.oci_core_images.oraclelinux-8-aarch64.images.0.id,
       data.oci_core_images.oraclelinux-7_9-aarch64.images.0.id,
-      data.oci_core_images.ubuntu-24_04-aarch64.images.0.id,
+      #data.oci_core_images.ubuntu-24_04-aarch64.images.0.id,
       data.oci_core_images.ubuntu-22_04-aarch64.images.0.id,
       data.oci_core_images.ubuntu-20_04-aarch64.images.0.id,
       # Ubuntu 18.04 no longer in OCI catalog
@@ -107,9 +107,9 @@ locals {
       oraclelinux79  = {
         os_image_id  = data.oci_core_images.oraclelinux-7_9-aarch64.images.0.id
       }
-      ubuntu2404     = {
-        os_image_id  = data.oci_core_images.ubuntu-24_04-aarch64.images.0.id
-      }
+      #ubuntu2404     = {
+      #  os_image_id  = data.oci_core_images.ubuntu-24_04-aarch64.images.0.id
+      #}
       ubuntu2204     = {
         os_image_id  = data.oci_core_images.ubuntu-22_04-aarch64.images.0.id
       }

diff --git a/archive/ubuntu1804.tf → ubuntu1804.tf.off b/archive/ubuntu1804.tf → ubuntu1804.tf.off
diff --git a/ubuntu2404.tf → ubuntu2404.tf.off b/ubuntu2404.tf → ubuntu2404.tf.off
@@ -8,11 +8,11 @@ data "oci_core_images" "ubuntu-24_04-aarch64" {
   operating_system_version = "24.04"
 
   # include Aarch64 specific images
-  filter {
-    name   = "display_name"
-     values = ["^.*-aarch64-.*$"]
-    regex  = true
-  }
+#  filter {
+#    name   = "display_name"
+#     values = ["^.*-aarch64-.*$"]
+#    regex  = true
+#  }
 }
 
 # Output OCI Ubuntu 24.04 Image Name