From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42D2330C377 for ; Tue, 2 Sep 2025 13:54:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756821275; cv=none; b=ResTXohL/S2pQKjy3efaLAHjDEeSxWpPFsHolHr4QPY3qDaJojzGS6XkiLityeg3lssJbqL80wxnGpBQLIZr64s4pyN2Di8LzvWYzIYDQAzY2O6BBlMuxhh50PXSdkg0bUgv30rc/LwlKD/qvd4UGZ8sE0JAIQa7ISwNE94UUrw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756821275; c=relaxed/simple; bh=hkArjSaoVLlTLtZt/w2d5Kb32INlEoW2ojR3gv/WsZs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=elpU5Uhk3qGQmXwB8v/0PBxZzYOH4I8YG4iXcgWUOrdZHtFfyb3GNAH8ilBsM8WfQZFjKyNHD7fTNXDhcSnDp7jD+Fn8pDbZHli4ACNbnAoi6QGBtS4FjXe2lyP5zUMlSVYnvK9cyzeXyKoaBEhO617kBbSvuO2IGJQvMUbdiVM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BbskOCZM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BbskOCZM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCA65C4CEF7; Tue, 2 Sep 2025 13:54:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756821275; bh=hkArjSaoVLlTLtZt/w2d5Kb32INlEoW2ojR3gv/WsZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BbskOCZMlImwgRTxkQTee6gXpAoUk2DUHtle6mhpOzpthVKiKJlrSp5Dvlb81N/qI NsBy5Nk7F3Kp7Cj7QR8WkxOFfUlmRykNmDQERsu1aIubQHsTTbZ5rOXiS51eU0Vbex L1OKsZsTYm7t7kaZlLkw/NQJP5aQbTKE4v1UH+VCX082zt+nG+EwiowsHgcnQaf3ck B9ncRCM2o8k6UGzhkkTP0oMh1r+XE55rpWgOLwV22cjU3c6OePOiqZsrhQhS/zJbpD KCyLmjtsz+lR6JQ0kS3s2WuY8rqcnRgUVssdDtjI4RFoLtuyxP6yed+87afMmLLo6v zVTrSOduijQNQ== From: Chuck Lever To: Cc: Chuck Lever , Luis Chamberlain Subject: [PATCH v2 12/37] Revert "terraform/aws: Add Oracle Linux AMI selections" Date: Tue, 2 Sep 2025 09:53:59 -0400 Message-ID: <20250902135426.815079-13-cel@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902135426.815079-1-cel@kernel.org> References: <20250902135426.815079-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever The Oracle Linux AMIs are only for-pay marketplace options, not created by Amazon itself. Reviewed-by: Luis Chamberlain Signed-off-by: Chuck Lever --- 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