Skip to content

Commit

Permalink
archiving oses not found
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Pouliot committed Sep 25, 2024
1 parent 431a17a commit 61d316a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 14 deletions.
0 openmandriva.tf → archive/openmandriva.tf
View file
File renamed without changes.
0 ubuntu1804.tf → archive/ubuntu1804.tf
View file
File renamed without changes.
37 changes: 23 additions & 14 deletions images.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,31 @@ output "oci_aarch64_images_map" {
"${data.oci_marketplace_listing.rockylinux_8.name}${data.oci_core_app_catalog_listing_resource_version.rockylinux_8_catalog_listing.listing_resource_version}",
"${data.oci_marketplace_listing.rockylinux_9.name}${data.oci_core_app_catalog_listing_resource_version.rockylinux_9_catalog_listing.listing_resource_version}",
"${data.oci_marketplace_listing.freebsd.name}${data.oci_core_app_catalog_listing_resource_version.freebsd_catalog_listing.listing_resource_version}",
"${data.oci_marketplace_listing.openmandriva.name}${data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_version}",
# 9/25/2024 - Looks like openmandriva was delisted from the OCI marketplace
# "${data.oci_marketplace_listing.openmandriva.name}${data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_version}",
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-22_04-aarch64.images.0.display_name,
data.oci_core_images.ubuntu-20_04-aarch64.images.0.display_name,
data.oci_core_images.ubuntu-18_04-aarch64.images.0.display_name
# Ubuntu 18.04 no longer in OCI catalog
#data.oci_core_images.ubuntu-18_04-aarch64.images.0.display_name
],
[
data.oci_core_app_catalog_listing_resource_version.almalinux_8_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.almalinux_9_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.rockylinux_8_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.rockylinux_9_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.freebsd_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_id,
# 9/25/2024 - Looks like openmandriva was delisted from the OCI marketplace
# data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_id,
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-22_04-aarch64.images.0.id,
data.oci_core_images.ubuntu-20_04-aarch64.images.0.id,
data.oci_core_images.ubuntu-18_04-aarch64.images.0.id
# Ubuntu 18.04 no longer in OCI catalog
#data.oci_core_images.ubuntu-18_04-aarch64.images.0.id
]
)
}
Expand All @@ -41,27 +45,31 @@ locals {
"${data.oci_marketplace_listing.rockylinux_8.name}${data.oci_core_app_catalog_listing_resource_version.rockylinux_8_catalog_listing.listing_resource_version}",
"${data.oci_marketplace_listing.rockylinux_9.name}${data.oci_core_app_catalog_listing_resource_version.rockylinux_9_catalog_listing.listing_resource_version}",
"${data.oci_marketplace_listing.freebsd.name}${data.oci_core_app_catalog_listing_resource_version.freebsd_catalog_listing.listing_resource_version}",
"${data.oci_marketplace_listing.openmandriva.name}${data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_version}",
# 9/25/2024 - Looks like openmandriva was delisted from the OCI marketplace
#"${data.oci_marketplace_listing.openmandriva.name}${data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_version}",
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-22_04-aarch64.images.0.display_name,
data.oci_core_images.ubuntu-20_04-aarch64.images.0.display_name,
data.oci_core_images.ubuntu-18_04-aarch64.images.0.display_name
# Ubuntu 18.04 no longer in OCI catalog
#data.oci_core_images.ubuntu-18_04-aarch64.images.0.display_name
],
[
data.oci_core_app_catalog_listing_resource_version.almalinux_8_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.almalinux_9_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.rockylinux_8_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.rockylinux_9_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.freebsd_catalog_listing.listing_resource_id,
data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_id,
# 9/25/2024 - Looks like openmandriva was delisted from the OCI marketplace
#data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_id,
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-22_04-aarch64.images.0.id,
data.oci_core_images.ubuntu-20_04-aarch64.images.0.id,
data.oci_core_images.ubuntu-18_04-aarch64.images.0.id,
# Ubuntu 18.04 no longer in OCI catalog
#data.oci_core_images.ubuntu-18_04-aarch64.images.0.id,
]
)

Expand All @@ -83,9 +91,9 @@ locals {
freebsd = {
os_image_id = data.oci_core_app_catalog_listing_resource_version.freebsd_catalog_listing.listing_resource_id
}
openmandriva = {
os_image_id = data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_id
}
#openmandriva = {
# os_image_id = data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_id
#}
oraclelinux9 = {
os_image_id = data.oci_core_images.oraclelinux-9-aarch64.images.0.id
}
Expand All @@ -101,9 +109,10 @@ locals {
ubuntu2004 = {
os_image_id = data.oci_core_images.ubuntu-20_04-aarch64.images.0.id
}
ubuntu1804 = {
os_image_id = data.oci_core_images.ubuntu-18_04-aarch64.images.0.id
}
# Ubuntu 18.04 no longer in OCI catalog
#ubuntu1804 = {
# os_image_id = data.oci_core_images.ubuntu-18_04-aarch64.images.0.id
#}
}

}
Expand Down

0 comments on commit 61d316a

Please sign in to comment.