From ec503e7d6a9b5f1a5cbc2fa26c5572a3eac335f3 Mon Sep 17 00:00:00 2001
From: Sokratis Siozos-Drosos <ssd@monosolutions.com>
Date: Wed, 24 Apr 2019 11:17:56 +0200
Subject: [PATCH] (MODE-11365) minor module changes for no downtime.

---
 deployment/eu-central-1/dev/tileserver/terraform.tfvars  | 2 +-
 deployment/eu-central-1/prod/tileserver/terraform.tfvars | 2 +-
 deployment/modules/tileserver/autoscaling.tf             | 6 +++---
 deployment/modules/tileserver/target_groups.tf           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/eu-central-1/dev/tileserver/terraform.tfvars b/deployment/eu-central-1/dev/tileserver/terraform.tfvars
index 1cacb42..41b0561 100644
--- a/deployment/eu-central-1/dev/tileserver/terraform.tfvars
+++ b/deployment/eu-central-1/dev/tileserver/terraform.tfvars
@@ -14,5 +14,5 @@ mono_alb_remote_state = "dev/tileserver-alb/terraform.tfstate"
 mono_keypair_remote_state = "dev/mono-keypair/terraform.tfstate"
 mono_efs_remote_state = "dev/mono-efs/terraform.tfstate"
 mono_region = "fra"
-version = "2.0"
+version = "2.1"
 state_bucket = "tg-state-eu-central-1"
diff --git a/deployment/eu-central-1/prod/tileserver/terraform.tfvars b/deployment/eu-central-1/prod/tileserver/terraform.tfvars
index b859069..f9f6642 100644
--- a/deployment/eu-central-1/prod/tileserver/terraform.tfvars
+++ b/deployment/eu-central-1/prod/tileserver/terraform.tfvars
@@ -3,7 +3,7 @@ terragrunt = {
     path = "${find_in_parent_folders()}"
   }
   terraform {
-    source = "git::ssh://git@github.com/monosolutions/terraform-modules.git//mono-tileserver"
+    source = "/tmp/repo/deployment/modules/tileserver"
   }
 }
 region = "eu-central-1"
diff --git a/deployment/modules/tileserver/autoscaling.tf b/deployment/modules/tileserver/autoscaling.tf
index 560af92..faebd9d 100644
--- a/deployment/modules/tileserver/autoscaling.tf
+++ b/deployment/modules/tileserver/autoscaling.tf
@@ -1,5 +1,5 @@
 resource "aws_launch_configuration" "launchconfiguration" {
-  name_prefix          = "maps-${var.environment}-"
+  name_prefix          = "maps-${var.environment}-${var.version}-"
   image_id             = "${data.aws_ami.amazon_linux.id}"
   key_name             = "${data.terraform_remote_state.mono_keypair.key_name}"
   iam_instance_profile = "${aws_iam_instance_profile.profile.name}"
@@ -19,7 +19,7 @@ resource "aws_launch_configuration" "launchconfiguration" {
 
 resource "aws_autoscaling_group" "autoscalinggroup" {
   vpc_zone_identifier  = ["${data.terraform_remote_state.mono_vpc.sn_private_a_id}"]
-  name_prefix          = "maps-${var.environment}-${var.version}"
+  name          = "maps-${aws_launch_configuration.launchconfiguration.name}"
   launch_configuration = "${aws_launch_configuration.launchconfiguration.name}"
   max_size             = 5
   desired_capacity     = 1
@@ -27,7 +27,7 @@ resource "aws_autoscaling_group" "autoscalinggroup" {
   health_check_grace_period = 300
   health_check_type = "ELB"
   force_delete = true
-  termination_policies = ["OldestInstance"]
+  termination_policies = ["OldestInstance", "OldestLaunchConfiguration"]
 
   target_group_arns = ["${aws_alb_target_group.target_group_this.arn}"]
   enabled_metrics = ["GroupMinSize", "GroupMaxSize", 
diff --git a/deployment/modules/tileserver/target_groups.tf b/deployment/modules/tileserver/target_groups.tf
index 5bf452d..473759d 100644
--- a/deployment/modules/tileserver/target_groups.tf
+++ b/deployment/modules/tileserver/target_groups.tf
@@ -1,5 +1,5 @@
 resource "aws_alb_target_group" "target_group_this" {
-  name_prefix = "maps-"
+  name = "maps"
   port = "80"
   protocol = "HTTP"
   vpc_id = "${data.terraform_remote_state.mono_vpc.vpc_id[0]}"