From: Chuck Lever <cel@kernel.org>
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v3 12/36] Revert "terraform/aws: Add Oracle Linux AMI selections"
Date: Thu, 4 Sep 2025 11:15:00 -0400 [thread overview]
Message-ID: <20250904151526.1596282-13-cel@kernel.org> (raw)
In-Reply-To: <20250904151526.1596282-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
The Oracle Linux AMIs are only for-pay marketplace options, not
created by Amazon itself.
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
terraform/aws/kconfigs/Kconfig.compute | 4 --
terraform/aws/kconfigs/distros/Kconfig.oracle | 48 -------------------
2 files changed, 52 deletions(-)
delete mode 100644 terraform/aws/kconfigs/distros/Kconfig.oracle
diff --git a/terraform/aws/kconfigs/Kconfig.compute b/terraform/aws/kconfigs/Kconfig.compute
index bae0ea1c9d7b..4b9c6efb6372 100644
--- a/terraform/aws/kconfigs/Kconfig.compute
+++ b/terraform/aws/kconfigs/Kconfig.compute
@@ -99,9 +99,6 @@ config TERRAFORM_AWS_DISTRO_DEBIAN
config TERRAFORM_AWS_DISTRO_FEDORA
bool "Fedora Core"
-config TERRAFORM_AWS_DISTRO_OL
- bool "Oracle Linux"
-
config TERRAFORM_AWS_DISTRO_RHEL
bool "Red Hat Enterprise Linux"
@@ -116,7 +113,6 @@ endchoice
source "terraform/aws/kconfigs/distros/Kconfig.amazon"
source "terraform/aws/kconfigs/distros/Kconfig.debian"
source "terraform/aws/kconfigs/distros/Kconfig.fedora"
-source "terraform/aws/kconfigs/distros/Kconfig.oracle"
source "terraform/aws/kconfigs/distros/Kconfig.rhel"
source "terraform/aws/kconfigs/distros/Kconfig.sles"
source "terraform/aws/kconfigs/distros/Kconfig.custom"
diff --git a/terraform/aws/kconfigs/distros/Kconfig.oracle b/terraform/aws/kconfigs/distros/Kconfig.oracle
deleted file mode 100644
index fd4166c457c5..000000000000
--- a/terraform/aws/kconfigs/distros/Kconfig.oracle
+++ /dev/null
@@ -1,48 +0,0 @@
-if TERRAFORM_AWS_DISTRO_OL
-
-config TERRAFORM_AWS_AMI_OWNER
- string
- output yaml
- default "amazon"
-
-if TARGET_ARCH_X86_64
-
-choice
- prompt "Oracle Linux release"
- default TERRAFORM_AWS_OL9_X86_64
-
-config TERRAFORM_AWS_OL8_X86_64
- bool "Oracle Linux 8 (x86)"
-
-config TERRAFORM_AWS_OL9_X86_64
- bool "Oracle Linux 9 (x86)"
-
-endchoice
-
-config TERRAFORM_AWS_NS
- string
- output yaml
- default "Oracle-Linux-8.*x86_64-*" if TERRAFORM_AWS_OL8_X86_64
- default "Oracle-Linux-9.*x86_64-*" if TERRAFORM_AWS_OL9_X86_64
-
-endif # TARGET_ARCH_X86_64
-
-if TARGET_ARCH_ARM64
-
-choice
- prompt "Oracle Linux release"
- default TERRAFORM_AWS_OL9_ARM64
-
-config TERRAFORM_AWS_OL9_ARM64
- bool "Oracle Linux 9 (arm64)"
-
-endchoice
-
-config TERRAFORM_AWS_NS
- string
- output yaml
- default "Oracle-Linux-9.*arm64-*" if TERRAFORM_AWS_OL9_ARM64
-
-endif # TARGET_ARCH_ARM64
-
-endif # TERRAFORM_AWS_DISTRO_OL
--
2.51.0
next prev parent reply other threads:[~2025-09-04 15:15 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 15:14 [PATCH v3 00/36] Various fixes Chuck Lever
2025-09-04 15:14 ` [PATCH v3 01/36] scripts: Update gen_ssh_key.sh Chuck Lever
2025-09-04 15:14 ` [PATCH v3 02/36] terraform/azure: Fix count of managed disks Chuck Lever
2025-09-04 15:14 ` [PATCH v3 03/36] terraform/azure: Remove tags from terraform configuration Chuck Lever
2025-09-04 15:14 ` [PATCH v3 04/36] terraform/azure: Enable network acceleration Chuck Lever
2025-09-04 15:14 ` [PATCH v3 05/36] terraform/azure: Make the resource group name a variable Chuck Lever
2025-09-04 15:14 ` [PATCH v3 06/36] terraform/azure: Remove the provider version constraint Chuck Lever
2025-09-04 15:14 ` [PATCH v3 07/36] terraform/azure: Update the RHEL publishers Chuck Lever
2025-09-04 15:14 ` [PATCH v3 08/36] terraform/oci: Work around oracle/oci provider bug Chuck Lever
2025-09-04 15:14 ` [PATCH v3 09/36] terraform/oci: Add Kconfig choices for disk performance provisioning Chuck Lever
2025-09-04 15:14 ` [PATCH v3 10/36] terraform/oci: Enable preemptible compute instances Chuck Lever
2025-09-04 15:14 ` [PATCH v3 11/36] terraform/aws: Fix zone selection for us_west1 Chuck Lever
2025-09-04 15:15 ` Chuck Lever [this message]
2025-09-04 15:15 ` [PATCH v3 13/36] terraform/aws: Remove unused terraform tags Chuck Lever
2025-09-04 15:15 ` [PATCH v3 14/36] terraform/GCE: Fix the default disk throughput values Chuck Lever
2025-09-04 15:15 ` [PATCH v3 15/36] terraform/gce: Remove unused tags Chuck Lever
2025-09-04 15:15 ` [PATCH v3 16/36] terraform/gce: Remove support for Fedora Chuck Lever
2025-09-04 15:15 ` [PATCH v3 17/36] terraform/gce: Update existing machine types and introduce new ones Chuck Lever
2025-09-04 15:15 ` [PATCH v3 18/36] terraform: Create the user's .ssh/config if it does not already exist Chuck Lever
2025-09-04 15:15 ` [PATCH v3 19/36] pynfs: Don't install xdrlib3 on older RHEL Chuck Lever
2025-09-04 15:15 ` [PATCH v3 20/36] guestfs: Update the guestfs playbook description Chuck Lever
2025-09-04 15:15 ` [PATCH v3 21/36] gen_hosts: Add 'localhost' to the [all] group Chuck Lever
2025-09-04 15:15 ` [PATCH v3 22/36] guestfs: Don't run the 'destroy' tags on the controller Chuck Lever
2025-09-04 15:15 ` [PATCH v3 23/36] base_image: Skip "locales-all" package installation Chuck Lever
2025-09-04 15:15 ` [PATCH v3 24/36] update_etc_hosts: ipaddr Chuck Lever
2025-09-04 15:15 ` [PATCH v3 25/36] Add an Ansible requirements.yml file Chuck Lever
2025-09-04 15:15 ` [PATCH v3 26/36] terraform/oci: Clean up the route table resource Chuck Lever
2025-09-04 15:15 ` [PATCH v3 27/36] guestfs: Correct the spelling of "drives" Chuck Lever
2025-09-04 15:15 ` [PATCH v3 28/36] guestfs: Configure how many extra drives to provision Chuck Lever
2025-09-04 15:15 ` [PATCH v3 29/36] ltp: Replace /opt with a symlink to data partition Chuck Lever
2025-09-04 15:15 ` [PATCH v3 30/36] terraform: Squelch Ansible complaints about missing inventory file Chuck Lever
2025-09-04 15:15 ` [PATCH v3 31/36] terraform: Skip localhost when waiting for targets to reboot Chuck Lever
2025-09-04 15:15 ` [PATCH v3 32/36] devconfig: include the "service" group in the playbooks hosts list Chuck Lever
2025-09-05 10:25 ` Daniel Gomez
2025-09-04 15:15 ` [PATCH v3 33/36] Makefile: Remove CONFIG_TOPDIR_PATH_HAS_SHA256SUM Chuck Lever
2025-09-04 15:15 ` [PATCH v3 34/36] Makefile: Set TOPDIR_PATH and generate its sha256sum at run time Chuck Lever
2025-09-04 15:15 ` [PATCH v3 35/36] ansible.cfg: generate an ansible.cfg file in TOPDIR Chuck Lever
2025-09-04 15:15 ` [PATCH v3 36/36] inventory: generate the inventory pathname dynamically Chuck Lever
2025-09-05 13:21 ` Daniel Gomez
2025-09-04 17:16 ` [PATCH v3 00/36] Various fixes Luis Chamberlain
2025-09-05 13:06 ` Daniel Gomez
2025-09-05 16:37 ` Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250904151526.1596282-13-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox