From fd4f6406c62b87d9e034cda71db7f2dc99121ce5 Mon Sep 17 00:00:00 2001 From: enxebre Date: Tue, 28 Jul 2015 16:48:59 +0100 Subject: [PATCH 1/2] Default env variables for aws. --- bootstrap/aws/config-default.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap/aws/config-default.sh b/bootstrap/aws/config-default.sh index b86b76df..5f389677 100644 --- a/bootstrap/aws/config-default.sh +++ b/bootstrap/aws/config-default.sh @@ -23,8 +23,8 @@ export TF_VAR_atlas_artifact_version_master=${TF_VAR_atlas_artifact_version_mast export TF_VAR_atlas_artifact_version_slave=${TF_VAR_atlas_artifact_version_slave:-6} export TF_VAR_region=${TF_VAR_region:-eu-west-1} -export TF_VAR_master_size=${TF_VAR_master_size:-m1.medium} -export TF_VAR_slave_size=${TF_VAR_slave_size:-m1.medium} +export TF_VAR_master_size=${TF_VAR_master_size:-m3.medium} +export TF_VAR_slave_size=${TF_VAR_slave_size:-m3.medium} export TF_VAR_slaves=${TF_VAR_slaves:-1} export TF_VAR_availability_zones=${TF_VAR_availability_zones:-'eu-west-1a,eu-west-1b,eu-west-1c'} export TF_VAR_public_subnet_availability_zone=${TF_VAR_public_subnet_availability_zone:-'eu-west-1a'} From e393cc5003d0c732bd5f86fadd716c51ab474207 Mon Sep 17 00:00:00 2001 From: enxebre Date: Tue, 28 Jul 2015 16:49:22 +0100 Subject: [PATCH 2/2] Running docker service on bastion. --- terraform/aws/bastion-server.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/aws/bastion-server.tf b/terraform/aws/bastion-server.tf index 476c265e..03617983 100644 --- a/terraform/aws/bastion-server.tf +++ b/terraform/aws/bastion-server.tf @@ -26,6 +26,7 @@ resource "aws_instance" "bastion" { "echo 1 | sudo tee /proc/sys/net/ipv4/conf/all/forwarding", /* Install docker */ "curl -sSL https://get.docker.com/ubuntu/ | sudo sh", + "sudo service docker start", /* Initialize open vpn data container */ "sudo mkdir -p /etc/openvpn", "sudo docker run --name ovpn-data -v /etc/openvpn busybox",