Skip to content

Commit 0d69a7d

Browse files
authored
Merge branch 'master' into master
2 parents cdbb713 + 8284c29 commit 0d69a7d

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

main.tf

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,26 @@
1717
# Multiple LBs ?
1818

1919
module "enable_logging" {
20-
source = "devops-workflow/boolean/local"
21-
version = "0.1.0"
20+
#source = "devops-workflow/boolean/local"
21+
#version = "0.1.0"
22+
#source = "git::https://github.com/WisePricer/terraform-local-boolean.git?ref=tags/v0.1.1"
23+
source = "git::https://github.com/WisePricer/terraform-local-boolean.git"
2224
value = "${var.enable_logging}"
2325
}
2426

2527
module "enabled" {
26-
source = "devops-workflow/boolean/local"
27-
version = "0.1.0"
28+
#source = "devops-workflow/boolean/local"
29+
#version = "0.1.0"
30+
#source = "git::https://github.com/WisePricer/terraform-local-boolean.git?ref=tags/v0.1.1"
31+
source = "git::https://github.com/WisePricer/terraform-local-boolean.git"
2832
value = "${var.enabled}"
2933
}
3034

3135
module "label" {
32-
source = "devops-workflow/label/local"
33-
version = "0.1.2"
36+
#source = "devops-workflow/label/local"
37+
#version = "0.1.2"
38+
#source = "git::https://github.com/WisePricer/terraform-local-label.git?ref=tags/v0.1.3"
39+
source = "git::https://github.com/WisePricer/terraform-local-label.git"
3440
organization = "${var.organization}"
3541
name = "${var.name}"
3642
namespace-env = "${var.namespace-env}"
@@ -44,8 +50,10 @@ module "label" {
4450
# TODO: need to support from var both basename and a complete name
4551
# may have 1 log bucket for many apps
4652
module "log_bucket" {
47-
source = "devops-workflow/label/local"
48-
version = "0.1.2"
53+
#source = "devops-workflow/label/local"
54+
#version = "0.1.2"
55+
#source = "git::https://github.com/WisePricer/terraform-local-label.git?ref=tags/v0.1.3"
56+
source = "git::https://github.com/WisePricer/terraform-local-label.git"
4957
organization = "${var.organization}"
5058
name = "${var.log_bucket_name}"
5159
namespace-env = true
@@ -351,7 +359,6 @@ resource "aws_lb_target_group" "network" {
351359

352360
#deregistration_delay = "${}"
353361
#target_type = "${}"
354-
355362
lifecycle {
356363
create_before_destroy = true
357364
}

0 commit comments

Comments
 (0)