Merge branch 'master' into master

devops-workflow · Mar 7, 2018 · 0d69a7d · 0d69a7d
2 parents cdbb713 + 8284c29
commit 0d69a7d
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/main.tf b/main.tf
@@ -17,20 +17,26 @@
 #   Multiple LBs ?
 
 module "enable_logging" {
-  source  = "devops-workflow/boolean/local"
-  version = "0.1.0"
+  #source  = "devops-workflow/boolean/local"
+  #version = "0.1.0"
+  #source  = "git::https://github.com/WisePricer/terraform-local-boolean.git?ref=tags/v0.1.1"
+  source  = "git::https://github.com/WisePricer/terraform-local-boolean.git"
   value   = "${var.enable_logging}"
 }
 
 module "enabled" {
-  source  = "devops-workflow/boolean/local"
-  version = "0.1.0"
+  #source  = "devops-workflow/boolean/local"
+  #version = "0.1.0"
+  #source  = "git::https://github.com/WisePricer/terraform-local-boolean.git?ref=tags/v0.1.1"
+  source  = "git::https://github.com/WisePricer/terraform-local-boolean.git"
   value   = "${var.enabled}"
 }
 
 module "label" {
-  source        = "devops-workflow/label/local"
-  version       = "0.1.2"
+  #source        = "devops-workflow/label/local"
+  #version       = "0.1.2"
+  #source        = "git::https://github.com/WisePricer/terraform-local-label.git?ref=tags/v0.1.3"
+  source        = "git::https://github.com/WisePricer/terraform-local-label.git"
   organization  = "${var.organization}"
   name          = "${var.name}"
   namespace-env = "${var.namespace-env}"
@@ -44,8 +50,10 @@ module "label" {
 # TODO: need to support from var both basename and a complete name
 #       may have 1 log bucket for many apps
 module "log_bucket" {
-  source        = "devops-workflow/label/local"
-  version       = "0.1.2"
+  #source        = "devops-workflow/label/local"
+  #version       = "0.1.2"
+  #source        = "git::https://github.com/WisePricer/terraform-local-label.git?ref=tags/v0.1.3"
+  source        = "git::https://github.com/WisePricer/terraform-local-label.git"
   organization  = "${var.organization}"
   name          = "${var.log_bucket_name}"
   namespace-env = true
@@ -351,7 +359,6 @@ resource "aws_lb_target_group" "network" {
 
   #deregistration_delay  = "${}"
   #target_type           = "${}"
-
   lifecycle {
     create_before_destroy = true
   }