Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ endif

ifeq (${platform},Darwin)
install-python-dependencies:
sudo -H pip install --upgrade ${pydeps}
sudo -H pip3 install --upgrade ${pydeps}
else
install-python-dependencies:
pip install --upgrade pyyaml boto3
pip3 install --upgrade pyyaml boto3
endif

install-tools: $(tools)
Expand Down
3 changes: 2 additions & 1 deletion docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
| external_elb | Security group for external ELBs. |
| internal_subnets | Comma separated list of internal subnet IDs. |
| external_subnets | Comma separated list of external subnet IDs. |
| internal_route_tables | Comma separated list of internal route table IDs. |
| external_route_tables | The external route table ID. |
| iam_role | ECS Service IAM role. |
| log_bucket_id | S3 bucket ID for ELB logs. |
| domain_name | The internal domain name, e.g "stack.local". |
Expand Down Expand Up @@ -572,4 +574,3 @@
| desired_count | The desired count | `1` | no |
| memory | The number of MiB of memory to reserve for the container | `512` | no |
| cpu | The number of cpu units to reserve for the container | `512` | no |

10 changes: 10 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,13 @@ output "vpc_id" {
output "ecs_cluster_security_group_id" {
value = "${module.ecs_cluster.security_group_id}"
}

// Comma separated list of internal route table IDs.
output "internal_route_tables" {
value = "${module.vpc.internal_rtb_id}"
}

// The external route table ID.
output "external_route_tables" {
value = "${module.vpc.external_rtb_id}"
}
2 changes: 1 addition & 1 deletion security-groups/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ resource "aws_security_group" "internal_elb" {
resource "aws_security_group" "external_elb" {
name = "${format("%s-%s-external-elb", var.name, var.environment)}"
vpc_id = "${var.vpc_id}"
description = "Allows internal ELB traffic"
description = "Allows external ELB traffic"

ingress {
from_port = 80
Expand Down