Skip to content

Commit 50dd75e

Browse files
committed
terraform/AWS: Remove selection of Debian Stretch
I can't find a current AMI owner that publishes a Debian Stretch image. Signed-off-by: Chuck Lever <[email protected]>
1 parent c45d085 commit 50dd75e

File tree

1 file changed

+2
-25
lines changed

1 file changed

+2
-25
lines changed

terraform/aws/kconfigs/Kconfig.compute

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -193,49 +193,26 @@ config TERRAFORM_AWS_NS_DEBIAN_11_ARM64
193193
help
194194
This option will set aws name search to debian-11-hvm-arm64-*
195195

196-
config TERRAFORM_AWS_NS_DEBIAN_STRETCH_X86_64
197-
bool "debian-stretch-hvm-x86_64-"
198-
depends on TARGET_ARCH_X86_64
199-
help
200-
This option will set aws name search to debian-stretch-hvm-x86_64-*
201-
This is no longer supported by the debian community.
202-
203-
config TERRAFORM_AWS_NS_DEBIAN_STRETCH_ARM64
204-
bool "debian-stretch-hvm-arm64-"
205-
depends on TARGET_ARCH_ARM64
206-
help
207-
This option will set aws name search to debian-stretch-hvm-arm64-*
208-
This is no longer supported by the debian community.
209-
210196
endchoice
211197

212-
config TERRAFORM_AWS_AMI_DEBIAN_OWNER
213-
string
214-
default "136693071363" if TERRAFORM_AWS_NS_DEBIAN_12_X86_64 || TERRAFORM_AWS_NS_DEBIAN_12_ARM64
215-
default "136693071363" if TERRAFORM_AWS_NS_DEBIAN_11_X86_64 || TERRAFORM_AWS_NS_DEBIAN_11_ARM64
216-
default "379101102735" if TERRAFORM_AWS_NS_DEBIAN_STRETCH_X86_64 || TERRAFORM_AWS_NS_DEBIAN_STRETCH_ARM64
217-
218198
endif
219199

220200
config TERRAFORM_AWS_AMI_OWNER
221201
string
222-
default TERRAFORM_AWS_AMI_DEBIAN_OWNER if TERRAFORM_AWS_AMI_DEBIAN
202+
default "136693071363" if TERRAFORM_AWS_NS_DEBIAN_11_X86_64 || TERRAFORM_AWS_NS_DEBIAN_11_ARM64
203+
default "136693071363" if TERRAFORM_AWS_NS_DEBIAN_12_X86_64 || TERRAFORM_AWS_NS_DEBIAN_12_ARM64
223204
default "137112412989" if TERRAFORM_AWS_AMI_AMAZON_X86_64 || TERRAFORM_AWS_AMI_AMAZON_ARM64
224205
default "309956199498" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_ARM64
225206
default "013907871322" if TERRAFORM_AWS_SLE15_SP4_X86_64 || TERRAFORM_AWS_SLE15_SP4_ARM64
226207
default "125523088429" if TERRAFORM_AWS_FEDORA40_X86_64 || TERRAFORM_AWS_FEDORA40_ARM64
227208
default "125523088429" if TERRAFORM_AWS_FEDORA41_X86_64 || TERRAFORM_AWS_FEDORA41_ARM64
228-
help
229-
This option specifies the AWS AMI owner.
230209

231210
config TERRAFORM_AWS_NS
232211
string
233212
default "debian-12-amd64-*" if TERRAFORM_AWS_NS_DEBIAN_12_X86_64
234213
default "debian-12-arm64-*" if TERRAFORM_AWS_NS_DEBIAN_12_ARM64
235214
default "debian-11-amd64-*" if TERRAFORM_AWS_NS_DEBIAN_11_X86_64
236215
default "debian-11-arm64-*" if TERRAFORM_AWS_NS_DEBIAN_11_ARM64
237-
default "debian-stretch-hvm-x86_64-*" if TERRAFORM_AWS_NS_DEBIAN_STRETCH_X86_64
238-
default "debian-stretch-hvm-arm64-*" if TERRAFORM_AWS_NS_DEBIAN_STRETCH_ARM64
239216
default "al2023-*-x86_64" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_AMI_AMAZON_X86_64
240217
default "al2023-*-arm64" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_AMI_AMAZON_ARM64
241218
default "RHEL-9.*x86_64-*" if TERRAFORM_AWS_RHEL9_X86_64

0 commit comments

Comments
 (0)