Merge pull request #284 from openregister/aws_ami

Specify instance image via aws_ami resource
openregister · Feb 15, 2017 · 5fb9d60 · 5fb9d60
2 parents e12dcd4 + 40aaaf1
commit 5fb9d60
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/aws/registers/main.tf b/aws/registers/main.tf
@@ -9,11 +9,21 @@ provider "statuscake" {
   apikey = "${var.statuscake_apikey}"
 }
 
+data "aws_ami" "ubuntu-xenial-ebs-ssd" {
+  most_recent = true
+  filter {
+    name = "name"
+    values = ["ubuntu/images/hvm-ssd/ubuntu-xenial*"]
+  }
+  owners = ["099720109477"] # canonical account
+}
+
 module "core" {
   source = "../modules/core"
   vpc_name = "${var.vpc_name}"
   vpc_cidr_block = "${var.vpc_cidr_block}"
   public_cidr_blocks = "${var.public_cidr_blocks}"
+  bastion_instance_ami = "${data.aws_ami.ubuntu-xenial-ebs-ssd.image_id}"
   bastion_user_data = "${file("templates/users.yaml")}"
   admin_ips = "${var.admin_ips}"
   sumologic_key = "${var.sumologic_key}"

diff --git a/aws/registers/register_group_address.tf b/aws/registers/register_group_address.tf
@@ -3,6 +3,7 @@ module "address" {
   id = "address"
   instance_count = "${lookup(var.group_instance_count, "address", 0)}"
   instance_type = "${lookup(var.group_instance_type, "address", "t2.large")}"
+  instance_ami = "${data.aws_ami.ubuntu-xenial-ebs-ssd.image_id}"
 
   vpc_name = "${var.vpc_name}"
   vpc_id = "${module.core.vpc_id}"

diff --git a/aws/registers/register_group_basic.tf b/aws/registers/register_group_basic.tf
@@ -3,6 +3,7 @@ module "basic" {
   id = "basic"
   instance_count = "${lookup(var.group_instance_count, "basic", 0)}"
   instance_type = "${lookup(var.group_instance_type, "basic", "t2.medium")}"
+  instance_ami = "${data.aws_ami.ubuntu-xenial-ebs-ssd.image_id}"
 
   vpc_name = "${var.vpc_name}"
   vpc_id = "${module.core.vpc_id}"

diff --git a/aws/registers/register_group_multi.tf b/aws/registers/register_group_multi.tf
@@ -3,6 +3,7 @@ module "multi" {
   id = "multi"
   instance_count = "${lookup(var.group_instance_count, "multi", 0)}"
   instance_type = "${lookup(var.group_instance_type, "multi", "t2.medium")}"
+  instance_ami = "${data.aws_ami.ubuntu-xenial-ebs-ssd.image_id}"
 
   vpc_name = "${var.vpc_name}"
   vpc_id = "${module.core.vpc_id}"