[PATCH v3 12/36] Revert "terraform/aws: Add Oracle Linux AMI selections"
Chuck Lever <[email protected]>
| Newsgroups | dev.linux.lists.kdevops |
|---|---|
| Message-ID | <[email protected]> |
From: Chuck Lever <[email protected]> The Oracle Linux AMIs are only for-pay marketplace options, not created by Amazon itself. Reviewed-by: Luis Chamberlain <[email protected]> Signed-off-by: Chuck Lever <[email protected]> --- 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