Merge branch 'release/1.2.0'

Author: npalm

CHNAGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [1.2.0] - 2018-07-30
 ### Added
 - Add a map for for a more flexible mechanism to tag.
 
@@ -14,6 +16,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Limit the resources access for docker machine.
 - Updated default docker build image to 18.03.1-ce
 
+### Fixes
+- Add fix for non correct ec2 instances starting, add retry to yum update
+
 ## [1.1.0] - 2018-07-14
 ### Added
 - Add variable to enable cloudwatch monitoring for spot instances, by default disabled.

template/logging.tpl

@@ -1,7 +1,8 @@
 echo 'installing additional software for logging'
 # installing in a loop to ensure the cli is intalled.
-for i in {1..5}
+for i in {1..7}
 do
+  echo "Attempt: ---- " $i
   yum install -y aws-cli awslogs jq && break || sleep 60
 done
 

template/user-data.tpl

@@ -7,7 +7,11 @@ tee /etc/hosts <<EOL
 127.0.0.1   localhost localhost.localdomain `hostname`
 EOL
 
-yum -y update
+for i in {1..7}
+do
+  echo "Attempt: ---- " $i
+  yum -y update  && break || sleep 60
+done
 
 ${logging}