diff --git a/archive/examples/ubuntu1804/cloud-init.yaml.tpl b/archive/examples/ubuntu1804/cloud-init.yaml.tpl deleted file mode 100644 index 5233b67..0000000 --- a/archive/examples/ubuntu1804/cloud-init.yaml.tpl +++ /dev/null @@ -1,38 +0,0 @@ -#cloud-config - -apt: - sources: - docker.list: - source: deb [arch=arm64] https://download.docker.com/linux/ubuntu $RELEASE stable - keyid: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 - -package_update: true -package_upgrade: true - -packages: - - screen - - rsync - - git - - curl - - docker-ce - - docker-ce-cli - - python3-pip - - python3-dev - - python3-selinux - - python3-setuptools - - python3-venv - - libffi-dev - - gcc - - libssl-dev - -groups: - - docker -system_info: - default_user: - groups: [docker] - -runcmd: - - docker run -d --name registry --restart=always -p 4000:5000 -v registry:/var/lib/registry registry:2 - - pip3 install -U pip - - pip3 install -U wheel - - echo 'OCI Ampere A1 Ubuntu 18.04 Example' >> /etc/motd diff --git a/archive/examples/ubuntu1804/main.tf b/archive/examples/ubuntu1804/main.tf deleted file mode 100644 index 0bc8049..0000000 --- a/archive/examples/ubuntu1804/main.tf +++ /dev/null @@ -1,30 +0,0 @@ -# Example of Ampere A1 running Ubuntu 18.04 on OCI using this module -variable "tenancy_ocid" {} -variable "user_ocid" {} -variable "fingerprint" {} -variable "private_key_path" {} -locals { - cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl" -} -module "oci-ampere-a1" { - source = "github.com/amperecomputing/terraform-oci-ampere-a1" - tenancy_ocid = var.tenancy_ocid - user_ocid = var.user_ocid - fingerprint = var.fingerprint - private_key_path = var.private_key_path -# Optional -# oci_vcn_cidr_block = "10.2.0.0/16" -# oci_vcn_cidr_subnet = "10.2.1.0/24" - oci_os_image = "ubuntu1804" - instance_prefix = "ampere-a1-ubuntu-1804" - oci_vm_count = "1" - ampere_a1_vm_memory = "24" - ampere_a1_cpu_core_count = "4" - cloud_init_template_file = local.cloud_init_template_path -} -output "oci_ampere_a1_private_ips" { - value = module.oci-ampere-a1.ampere_a1_private_ips -} -output "oci_ampere_a1_public_ips" { - value = module.oci-ampere-a1.ampere_a1_public_ips -} diff --git a/archive/openmandriva.tf b/archive/openmandriva.tf deleted file mode 100644 index 975a192..0000000 --- a/archive/openmandriva.tf +++ /dev/null @@ -1,61 +0,0 @@ -# "OpenMandriva Linux" -resource "oci_marketplace_accepted_agreement" "openmandriva_accepted_agreement" { - agreement_id = oci_marketplace_listing_package_agreement.openmandriva_package_agreement.agreement_id - compartment_id = var.tenancy_ocid - listing_id = data.oci_marketplace_listing.openmandriva.id - package_version = data.oci_marketplace_listing.openmandriva.default_package_version - signature = oci_marketplace_listing_package_agreement.openmandriva_package_agreement.signature -} -resource "oci_marketplace_listing_package_agreement" "openmandriva_package_agreement" { - agreement_id = data.oci_marketplace_listing_package_agreements.openmandriva_package_agreements.agreements[0].id - listing_id = data.oci_marketplace_listing.openmandriva.id - package_version = data.oci_marketplace_listing.openmandriva.default_package_version -} -data "oci_marketplace_listings" "openmandriva" { - pricing = ["Free"] - name = ["OpenMandriva"] - compartment_id = var.tenancy_ocid -} -data "oci_marketplace_listing_package_agreements" "openmandriva_package_agreements" { - listing_id = data.oci_marketplace_listing.openmandriva.id - package_version = data.oci_marketplace_listing.openmandriva.default_package_version - compartment_id = var.tenancy_ocid -} -data "oci_marketplace_listing_package" "openmandriva_package" { - listing_id = data.oci_marketplace_listing.openmandriva.id - package_version = data.oci_marketplace_listing.openmandriva.default_package_version - compartment_id = var.tenancy_ocid -} -data "oci_marketplace_listing_packages" "openmandriva_packages" { - listing_id = data.oci_marketplace_listing.openmandriva.id - compartment_id = var.tenancy_ocid -} -data "oci_marketplace_listing" "openmandriva" { - listing_id = data.oci_marketplace_listings.openmandriva.listings[0].id - compartment_id = var.tenancy_ocid -} -data "oci_core_app_catalog_listing_resource_versions" "openmandriva_app_catalog_listing_resource_versions" { - listing_id = data.oci_marketplace_listing_package.openmandriva_package.app_catalog_listing_id -} -data "oci_core_app_catalog_listing_resource_version" "openmandriva_catalog_listing" { - listing_id = data.oci_marketplace_listing_package.openmandriva_package.app_catalog_listing_id - resource_version = data.oci_marketplace_listing_package.openmandriva_package.app_catalog_listing_resource_version -} -resource "oci_core_app_catalog_listing_resource_version_agreement" "openmandriva_app_catalog_listing_resource_version_agreement" { - listing_id = data.oci_marketplace_listing_package.openmandriva_package.app_catalog_listing_id - listing_resource_version = data.oci_core_app_catalog_listing_resource_versions.openmandriva_app_catalog_listing_resource_versions.app_catalog_listing_resource_versions[0].listing_resource_version -} -resource "oci_core_app_catalog_subscription" "openmandriva_app_catalog_subscription" { - compartment_id = var.tenancy_ocid - eula_link = oci_core_app_catalog_listing_resource_version_agreement.openmandriva_app_catalog_listing_resource_version_agreement.eula_link - listing_id = oci_core_app_catalog_listing_resource_version_agreement.openmandriva_app_catalog_listing_resource_version_agreement.listing_id - listing_resource_version = oci_core_app_catalog_listing_resource_version_agreement.openmandriva_app_catalog_listing_resource_version_agreement.listing_resource_version - oracle_terms_of_use_link = oci_core_app_catalog_listing_resource_version_agreement.openmandriva_app_catalog_listing_resource_version_agreement.oracle_terms_of_use_link - signature = oci_core_app_catalog_listing_resource_version_agreement.openmandriva_app_catalog_listing_resource_version_agreement.signature - time_retrieved = oci_core_app_catalog_listing_resource_version_agreement.openmandriva_app_catalog_listing_resource_version_agreement.time_retrieved -} - -# Output OCI OpenMandriva Image ID -output OCI_OpenMandriva_Linux_Image_id { - value = data.oci_core_app_catalog_listing_resource_version.openmandriva_catalog_listing.listing_resource_id -} diff --git a/centosstream8.tf b/centosstream8.tf.off similarity index 100% rename from centosstream8.tf rename to centosstream8.tf.off diff --git a/images.tf b/images.tf index 9e482f3..fd1df09 100644 --- 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 b/ubuntu1804.tf.off similarity index 100% rename from archive/ubuntu1804.tf rename to ubuntu1804.tf.off diff --git a/ubuntu2404.tf b/ubuntu2404.tf.off similarity index 88% rename from ubuntu2404.tf rename to ubuntu2404.tf.off index bca77f9..3c84fa1 100644 --- a/ubuntu2404.tf +++ b/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