update to latest version

8gears · Jan 11, 2018 · 07a4638 · 07a4638
1 parent bfcfc67
commit 07a4638
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/aws-tf/machines.tf b/aws-tf/machines.tf
@@ -49,6 +49,8 @@ resource "aws_instance" "ec2_ondemand_instance" {
 
 module "wvm_ssh_sg" {
  source = "terraform-aws-modules/security-group/aws"
+ version = "1.9.0"
+
 
  name = "wvm default"
  description = "Default Security group for the workshop VMs. with SSH,HTTP/S and RDP"

diff --git a/aws-tf/main.tf b/aws-tf/main.tf
@@ -1,6 +1,6 @@
 provider "aws" {
  region = "${var.vpc_region}"
- version = "~> 1.0"
+ version = "~> 1.6.0"
  access_key = "${var.aws_access_key_id}"
  secret_key = "${var.aws_secret_access_key}"
 }

diff --git a/aws-tf/variable.tf b/aws-tf/variable.tf
@@ -4,7 +4,7 @@
 #
 variable "workshop_user" {
  description = "The default Workshop User."
- default = "oiz"
+ default = "bud"
 }
 
 variable "workshop_user_password" {
@@ -26,11 +26,11 @@ variable "vpc_region" {
 }
 
 variable "vm_nodes_count" {
- default = 8
+ default = 10
 }
 
 variable "aws_instance_type" {
- default = "t2.xlarge"
+ default = "t2.large"
 }
 
 variable "private_key_file" {

diff --git a/files/docker.sh b/files/docker.sh
@@ -18,7 +18,7 @@ echo -e "\e[1;32m installing docker-compose... \e[0m"
 echo -e "\e[1;32m-------------------------------\e[0m"
 
 
-curl -sS -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.15.0/docker-compose-$(uname -s)-$(uname -m)"
+curl -sS -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.18.0/docker-compose-$(uname -s)-$(uname -m)"
 chmod +x /usr/local/bin/docker-compose
 
 echo "...installing docker-compose done. Installed Version is $(docker-compose -v)"