Allow specifing Ubuntu version. Change distro name to "ubuntu"

snemetz · snemetz · commit e4899f3c9b20 · 2018-02-17T05:28:40.000-08:00
diff --git a/main.tf b/main.tf
@@ -3,7 +3,7 @@
 # TODO: add variables for AmazonLinux version and try for Ubuntu
 
 locals {
-  names = "amazonlinux,ecs,ubuntu1604"
+  names = "amazonlinux,ecs,ubuntu"
 
   owners = "${join(",", list(
     var.ami_owners["amazon"],
@@ -14,7 +14,7 @@ locals {
   patterns = "${join(",", list(
     "amzn-ami-hvm-${var.ami_version_amazonlinux}-x86_64-gp2",
     "amzn-ami-${var.ami_version_ecs}-amazon-ecs-optimized",
-    "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*"
+    "ubuntu/images/hvm-ssd/ubuntu-${var.ami_version_ubuntu}-amd64-server-*"
   ))}"
 }
 
diff --git a/variables.tf b/variables.tf
@@ -20,6 +20,11 @@ variable "ami_version_ecs" {
   default     = "*"
 }
 
+variable "ami_version_ubuntu" {
+  description = "Ubuntu version to get"
+  default     = "xenial-16.04"
+}
+
 variable "distribution" {
-  description = "Linux distribution for AWS AMI, supported: amazonlinux, ecs, ubuntu1604"
+  description = "Linux distribution for AWS AMI, supported: amazonlinux, ecs, ubuntu"
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ variable "ami_version_ecs" {`
`20`	`20`	`default = "*"`
`21`	`21`	`}`
`22`	`22`
	`23`	`+variable "ami_version_ubuntu" {`
	`24`	`+ description = "Ubuntu version to get"`
	`25`	`+ default = "xenial-16.04"`
	`26`	`+}`
	`27`	`+`
`23`	`28`	`variable "distribution" {`
`24`		`- description = "Linux distribution for AWS AMI, supported: amazonlinux, ecs, ubuntu1604"`
	`29`	`+ description = "Linux distribution for AWS AMI, supported: amazonlinux, ecs, ubuntu"`
`25`	`30`	`}`