Merge pull request #433 from Capgemini/bastion-deploy-fix

Bastion deploy fix
Capgemini · Jul 28, 2015 · 4117f06 · shirkevich · Jul 28, 2015 · tayzlor
2 parents d99c204 + e393cc5
commit 4117f06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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'}

diff --git 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",