Merge branch 'master' of https://github.com/ONSdigital/eq-author-deploy…

… into eq-1835-increase-minimum-number-of-ecs-service-containers
ONSdigital · Feb 16, 2018 · 82e3e80 · 82e3e80
2 parents b7fce9e + 52de572
commit 82e3e80
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/author-api.tf b/author-api.tf
@@ -35,9 +35,13 @@ resource "aws_alb_listener_rule" "author-api" {
 resource "aws_route53_record" "author-api" {
   zone_id = "${data.aws_route53_zone.dns_zone.id}"
   name    = "${var.env}-author-api.${var.dns_zone_name}"
-  type    = "CNAME"
-  ttl     = "60"
-  records = ["${data.aws_alb.eq.dns_name}"]
+  type    = "A"
+
+  alias {
+    name                   = "${data.aws_alb.eq.dns_name}"
+    zone_id                = "${data.aws_alb.eq.zone_id}"
+    evaluate_target_health = false
+  }
 }
 
 data "template_file" "author-api" {

diff --git a/author.tf b/author.tf
@@ -35,9 +35,13 @@ resource "aws_alb_listener_rule" "author" {
 resource "aws_route53_record" "author" {
   zone_id = "${data.aws_route53_zone.dns_zone.id}"
   name    = "${var.env}-author.${var.dns_zone_name}"
-  type    = "CNAME"
-  ttl     = "60"
-  records = ["${data.aws_alb.eq.dns_name}"]
+  type    = "A"
+
+  alias {
+    name                   = "${data.aws_alb.eq.dns_name}"
+    zone_id                = "${data.aws_alb.eq.zone_id}"
+    evaluate_target_health = false
+  }
 }
 
 data "template_file" "author" {

diff --git a/publisher.tf b/publisher.tf
@@ -35,9 +35,13 @@ resource "aws_alb_listener_rule" "publisher" {
 resource "aws_route53_record" "publisher" {
   zone_id = "${data.aws_route53_zone.dns_zone.id}"
   name    = "${var.env}-publisher.${var.dns_zone_name}"
-  type    = "CNAME"
-  ttl     = "60"
-  records = ["${data.aws_alb.eq.dns_name}"]
+  type    = "A"
+
+  alias {
+    name                   = "${data.aws_alb.eq.dns_name}"
+    zone_id                = "${data.aws_alb.eq.zone_id}"
+    evaluate_target_health = false
+  }
 }
 
 data "template_file" "publisher" {