From e1e0cabb2a0ccc36ccd8d451b96c09818286413b Mon Sep 17 00:00:00 2001
From: James Johnson <James.Johnson@equifax.com>
Date: Wed, 8 Aug 2018 10:50:32 -0400
Subject: [PATCH] Add lb_tags to vault-elb module to provide additional tags

---
 modules/vault-elb/main.tf      | 8 +++-----
 modules/vault-elb/variables.tf | 5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/vault-elb/main.tf b/modules/vault-elb/main.tf
index 1d6b39aa..9684a12c 100644
--- a/modules/vault-elb/main.tf
+++ b/modules/vault-elb/main.tf
@@ -19,8 +19,8 @@ resource "aws_elb" "vault" {
   connection_draining         = "${var.connection_draining}"
   connection_draining_timeout = "${var.connection_draining_timeout}"
 
-  security_groups    = ["${aws_security_group.vault.id}"]
-  subnets            = ["${var.subnet_ids}"]
+  security_groups = ["${aws_security_group.vault.id}"]
+  subnets         = ["${var.subnet_ids}"]
 
   # Run the ELB in TCP passthrough mode
   listener {
@@ -38,9 +38,7 @@ resource "aws_elb" "vault" {
     timeout             = "${var.health_check_timeout}"
   }
 
-  tags {
-    Name = "${var.name}"
-  }
+  tags = "${merge(map("Name", var.name), var.lb_tags)}"
 }
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/modules/vault-elb/variables.tf b/modules/vault-elb/variables.tf
index e6114f75..f0a016e0 100644
--- a/modules/vault-elb/variables.tf
+++ b/modules/vault-elb/variables.tf
@@ -110,3 +110,8 @@ variable "health_check_timeout" {
   description = "The amount of time, in seconds, before a health check times out."
   default     = 5
 }
+
+variable "lb_tags" {
+  description = "Tags to be applied to the load balancer."
+  default     = {}
+}