Refactor setting selection mechanism

.gitignore

@@ -1,6 +1,8 @@
 *.pyc
 *.swp
 *~
-ips.txt
-ips.html
-ips.pdf
+prepare-vms/ips.txt
+prepare-vms/ips.html
+prepare-vms/ips.pdf
+prepare-vms/settings.yaml
+prepare-vms/tags

prepare-vms/scripts/ips-txt-to-html.py

@@ -11,9 +11,7 @@ def prettify(l):
 
 
 # Read settings from settings.yaml
-#with open(sys.argv[1]) as f:
-#with open("settings.yaml") as f:
-with open("settings/fundamentals-settings.yaml") as f:
+with open(sys.argv[1]) as f:
     data = f.read()
 
 SETTINGS = yaml.load(data)

prepare-vms/scripts/postprep.rc

@@ -1,16 +1,21 @@
+pssh -I tee /tmp/settings.yaml < $SETTINGS
+
 pssh -I tee /tmp/postprep.py <<EOF
 #!/usr/bin/env python
 import os
 import sys
 import time
 import urllib
+import yaml
 
 #################################
 
-COMPOSE_VERSION = os.environ.get("COMPOSE_VERSION") or "1.6.2"
-MACHINE_VERSION = os.environ.get("MACHINE_VERSION") or "0.6.0"
-SWARM_VERSION = os.environ.get("SWARM_VERSION") or "1.1.3"
-CLUSTER_SIZE = int(os.environ.get("CLUSTER_SIZE") or "1")
+config = yaml.load(open("/tmp/settings.yaml"))
+COMPOSE_VERSION = config["compose_version"]
+MACHINE_VERSION = config["machine_version"]
+SWARM_VERSION = config["swarm_version"]
+CLUSTER_SIZE = config["clustersize"]
+ENGINE_VERSION = config["engine_version"]
 
 #################################
 
@@ -72,7 +77,7 @@ system("echo 1000000 | sudo tee /proc/sys/net/nf_conntrack_max")
 #######################
 
 # This will install the latest Docker.
-system("curl --silent https://get.docker.com/ | grep -v '( set -x; sleep 20 )' | sudo sh")
+system("curl --silent https://{}/ | grep -v '( set -x; sleep 20 )' | sudo sh".format(ENGINE_VERSION))
 
 # Make sure that the daemon listens on 55555 (for orchestration workshop).
 # To test, run: export DOCKER_HOST=tcp://localhost:55555 ; docker ps

prepare-vms/scripts/trainer-cli

@@ -34,11 +34,12 @@ deploy_hq(){
 
 deploy_tag(){
     TAG=$1
+    SETTINGS=$2
     need_tag $TAG
     link_tag $TAG
 
 
-    count=$(cat ips.txt | wc -l)
+    count=$(wc -l ips.txt)
 
     # wait until all hosts are reachable before trying to deploy
     echo "Trying to reach $TAG instances..."
@@ -48,6 +49,7 @@ deploy_tag(){
     done
 
     echo "[[ Deploying tag $TAG ]]"
+    export SETTINGS
     source scripts/postprep.rc
     echo "Finished deploying $TAG."
     echo "You may want to run one of the following commands:"
@@ -92,8 +94,7 @@ pull_tag(){
 }
 
 wait_until_tag_is_running() {
-    # Wait up to 10 seconds for instances to be created
-    timeout=10
+    max_retry=50
     TAG=$1
     COUNT=$2
     i=0
@@ -108,8 +109,8 @@ wait_until_tag_is_running() {
             | tr "\t" "\n" \
             | wc -l)
 
-        if [[ $i -gt $timeout ]]; then \
-            die " Timed out while waiting for instance creation ($timeout secs)"; \
+        if [[ $i -gt $max_retry ]]; then
+            die "Timed out while waiting for instance creation (after $max_retry retries)"
         fi
         sleep 1
     done
@@ -119,10 +120,7 @@ tag_is_reachable() {
     TAG=$1
     need_tag $TAG
     link_tag $TAG
-    if ! pssh -t 5 true 2>&1 >/dev/null; then
-        return 1
-    fi
-    return 0
+    pssh -t 5 true 2>&1 >/dev/null
 }
 
 test_tag(){
@@ -231,20 +229,23 @@ get_ami() {
 make_cards(){
     # Generate cards for a given tag
     TAG=$1
-    IPS=$(aws_get_instance_ips_by_tag $TAG)
-    echo "$IPS" > tags/$TAG/ips.txt
+    SETTINGS_FILE=$2
+    [[ -z "$SETTINGS_FILE" ]] && {
+        echo "Please specify the settings file you want to use."
+        echo "e.g.: settings/orchestration.yaml"
+        exit 1
+    }
+    aws_get_instance_ips_by_tag $TAG > tags/$TAG/ips.txt
 
-    # Remove symlinks to old cards if they exist
-    for f in ips.html ips.pdf; do
-        if [ -e $f ]; then rm $f; fi
-    done
+    # Remove symlinks to old cards
+    rm -f ips.html ips.pdf
 
     # This will generate two files in the base dir: ips.pdf and ips.html
-    python scripts/ips-txt-to-html.py settings.yaml
+    python scripts/ips-txt-to-html.py $SETTINGS_FILE
 
     for f in ips.html ips.pdf; do
         # Remove old versions of cards if they exist
-        if [ -e tags/$TAG/$f ]; then rm tags/$TAG/$f; fi
+        rm -f tags/$TAG/$f
 
         # Move the generated file and replace it with a symlink
         mv -f $f tags/$TAG/$f && ln -s tags/$TAG/$f $f
@@ -280,7 +281,7 @@ run_cli() {
     cards)
         TAG=$2
         need_tag $TAG
-        make_cards $TAG
+        make_cards $TAG $3
         ;;
     deploy)
         TAG=$2
@@ -289,15 +290,17 @@ run_cli() {
             echo "Deploying HQ"
             deploy_hq $TAG
         else
-            workshop=$2
-            if [ -z $workshop ]; then
-                echo "Please specify a workshop name (fundamentals or orchestration)"
+            SETTINGS=$3
+            if [[ -z "$SETTINGS" ]]; then
+                echo "Please specify a settings file."
                 exit 1
             fi
-            echo "Deploying with $workshop settings"
-            ln -sf settings/$workshop-settings.yaml settings.yaml
-            deploy_tag $TAG
-        
+            if ! [[ -f "$SETTINGS" ]]; then
+                echo "Settings file $SETTINGS not found."
+                exit 1
+            fi
+            echo "Deploying with settings $SETTINGS."
+            deploy_tag $TAG $SETTINGS
         fi
         ;;
     ids)
@@ -472,7 +475,7 @@ run_cli() {
 
     Beta:
         ami                     Look up Amazon Machine Images
-        cards                   Generate cards (see settings.txt)
+        cards                   Generate cards
         opensg                  Modify AWS security groups
         "
         ;;

prepare-vms/settings.yaml

@@ -1 +0,0 @@
-settings/2016-03-25-20-45-jp-settings.yaml

prepare-vms/settings/fundamentals.yaml

@@ -28,3 +28,8 @@ footer: >
     <center>{url}</center>
 
 url: http://container.training/
+
+engine_version: get.docker.com
+compose_version: 1.6.2
+machine_version: 0.6.0
+swarm_version: 1.2.0-rc1

prepare-vms/settings/orchestration.yaml

@@ -28,3 +28,8 @@ footer: >
     <center>{url}</center>
 
 url: http://container.training/
+
+engine_version: get.docker.com
+compose_version: 1.6.2
+machine_version: 0.6.0
+swarm_version: 1.2.0-rc1