[PATCH v3 16/36] terraform/gce: Remove support for Fedora
Chuck Lever <[email protected]>
| Newsgroups | dev.linux.lists.kdevops |
|---|---|
| Message-ID | <[email protected]> |
From: Chuck Lever <[email protected]> Unlike the other Linux distributions, Fedora requires some cloud-init magic to set up the log-in user. I don't feel like digging into that right now, and no one is demanding that kdevops support Fedora on GCE at the moment. Reviewed-by: Luis Chamberlain <[email protected]> Signed-off-by: Chuck Lever <[email protected]> --- terraform/gce/kconfigs/Kconfig.compute | 4 - terraform/gce/kconfigs/images/Kconfig.fedora | 95 -------------------- 2 files changed, 99 deletions(-) delete mode 100644 terraform/gce/kconfigs/images/Kconfig.fedora diff --git a/terraform/gce/kconfigs/Kconfig.compute b/terraform/gce/kconfigs/Kconfig.compute index e647c9bb2ba7..0d3ae98e53d2 100644 --- a/terraform/gce/kconfigs/Kconfig.compute +++ b/terraform/gce/kconfigs/Kconfig.compute @@ -77,9 +77,6 @@ config TERRAFORM_GCE_DISTRO_CENTOS config TERRAFORM_GCE_DISTRO_DEBIAN bool "Debian" -config TERRAFORM_GCE_DISTRO_FEDORA - bool "Fedora" - config TERRAFORM_GCE_DISTRO_OL bool "Oracle Linux" @@ -99,7 +96,6 @@ endchoice source "terraform/gce/kconfigs/images/Kconfig.centos" source "terraform/gce/kconfigs/images/Kconfig.debian" -source "terraform/gce/kconfigs/images/Kconfig.fedora" source "terraform/gce/kconfigs/images/Kconfig.oracle" source "terraform/gce/kconfigs/images/Kconfig.opensuse" source "terraform/gce/kconfigs/images/Kconfig.rhel" diff --git a/terraform/gce/kconfigs/images/Kconfig.fedora b/terraform/gce/kconfigs/images/Kconfig.fedora deleted file mode 100644 index 90999617f9ce..000000000000 --- a/terraform/gce/kconfigs/images/Kconfig.fedora +++ /dev/null @@ -1,95 +0,0 @@ -if TERRAFORM_GCE_DISTRO_FEDORA - -config TERRAFORM_GCE_IMAGE_PROJECT - string - output yaml - default "fedora-coreos-cloud" - -config TERRAFORM_GCE_IMAGE_SIZE - int - output yaml - default 10 - -if TARGET_ARCH_X86_64 - -choice - prompt "Fedora stream to use" - default TERRAFORM_GCE_IMAGE_FEDORA_STABLE_X86_64 - -config TERRAFORM_GCE_IMAGE_FEDORA_STABLE_X86_64 - bool "stable (x86)" - help - The stable stream is the most reliable stream offered with - changes only reaching that stream after spending a period - of time in the testing stream. - -config TERRAFORM_GCE_IMAGE_FEDORA_TESTING_X86_64 - bool "testing (x86)" - help - The testing stream represents what is coming in the next - stable release. Content in this stream is updated - regularly and offers our community an opportunity to catch - breaking changes before they hit the stable stream. - -config TERRAFORM_GCE_IMAGE_FEDORA_NEXT_X86_64 - bool "next (x86)" - help - The next stream represents the future. It will often be - used to experiment with new features and also test out - rebases of our platform on top of the next major version - of Fedora. The content in the next stream will also - eventually filter down into testing and on to stable. - -endchoice - -config TERRAFORM_GCE_IMAGE_FAMILY - string - output yaml - default "fedora-coreos-stable" if TERRAFORM_GCE_IMAGE_FEDORA_STABLE_X86_64 - default "fedora-coreos-testing" if TERRAFORM_GCE_IMAGE_FEDORA_TESTING_X86_64 - default "fedora-coreos-next" if TERRAFORM_GCE_IMAGE_FEDORA_NEXT_X86_64 - -endif # TARGET_ARCH_X86_64 - -if TARGET_ARCH_ARM64 - -choice - prompt "Fedora stream to use" - default TERRAFORM_GCE_IMAGE_FEDORA_STABLE_ARM64 - -config TERRAFORM_GCE_IMAGE_FEDORA_STABLE_ARM64 - bool "stable (arm64)" - help - The stable stream is the most reliable stream offered with - changes only reaching that stream after spending a period - of time in the testing stream. - -config TERRAFORM_GCE_IMAGE_FEDORA_TESTING_ARM64 - bool "testing (arm64)" - help - The testing stream represents what is coming in the next - stable release. Content in this stream is updated - regularly and offers our community an opportunity to catch - breaking changes before they hit the stable stream. - -config TERRAFORM_GCE_IMAGE_FEDORA_NEXT_ARM64 - bool "next (arm64)" - help - The next stream represents the future. It will often be - used to experiment with new features and also test out - rebases of our platform on top of the next major version - of Fedora. The content in the next stream will also - eventually filter down into testing and on to stable. - -endchoice - -config TERRAFORM_GCE_IMAGE_FAMILY - string - output yaml - default "fedora-coreos-stable-arm64" if TERRAFORM_GCE_IMAGE_FEDORA_STABLE_ARM64 - default "fedora-coreos-testing-arm64" if TERRAFORM_GCE_IMAGE_FEDORA_TESTING_ARM64 - default "fedora-coreos-next-arm64" if TERRAFORM_GCE_IMAGE_FEDORA_NEXT_ARM64 - -endif # TARGET_ARCH_ARM64 - -endif # TERRAFORM_GCE_DISTRO_FEDORA -- 2.51.0