Merge branch 'master' into custom_user_data

SweetOps · SweetOps · commit 8cd4ca162230 · 2017-11-24T13:28:48.000+02:00
diff --git a/security_group.tf b/security_group.tf
@@ -11,6 +11,7 @@ resource "aws_security_group" "default" {
 }
 
 resource "aws_security_group_rule" "egress" {
+  count             = "${var.create_default_security_group == "true" ? 1 : 0}"
   type              = "egress"
   from_port         = 0
   to_port           = 65535
@@ -20,7 +21,7 @@ resource "aws_security_group_rule" "egress" {
 }
 
 resource "aws_security_group_rule" "ingress" {
-  count             = "${length(compact(var.allowed_ports))}"
+  count             = "${var.create_default_security_group == "true" ? length(compact(var.allowed_ports)) : 0}"
   type              = "ingress"
   from_port         = "${element(var.allowed_ports, count.index)}"
   to_port           = "${element(var.allowed_ports, count.index)}"

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ resource "aws_security_group" "default" {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`resource "aws_security_group_rule" "egress" {`
	`14`	`+ count = "${var.create_default_security_group == "true" ? 1 : 0}"`
`14`	`15`	`type = "egress"`
`15`	`16`	`from_port = 0`
`16`	`17`	`to_port = 65535`
`@@ -20,7 +21,7 @@ resource "aws_security_group_rule" "egress" {`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`resource "aws_security_group_rule" "ingress" {`
`23`		`- count = "${length(compact(var.allowed_ports))}"`
	`24`	`+ count = "${var.create_default_security_group == "true" ? length(compact(var.allowed_ports)) : 0}"`
`24`	`25`	`type = "ingress"`
`25`	`26`	`from_port = "${element(var.allowed_ports, count.index)}"`
`26`	`27`	`to_port = "${element(var.allowed_ports, count.index)}"`