From 8240734b6e877c48bbb09069713605bae79c5e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Mon, 28 Mar 2016 13:47:26 +0200
Subject: [PATCH] Fix Docker Machine install from OSX; add RC settings

---
 prepare-vms/scripts/postprep.rc |  5 ++++-
 prepare-vms/settings/rc.yaml    | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 prepare-vms/settings/rc.yaml

diff --git a/prepare-vms/scripts/postprep.rc b/prepare-vms/scripts/postprep.rc
index ec2da04c..72f3e0ba 100755
--- a/prepare-vms/scripts/postprep.rc
+++ b/prepare-vms/scripts/postprep.rc
@@ -1,8 +1,11 @@
 pssh -I tee /tmp/settings.yaml < $SETTINGS
 
+pssh sudo easy_install pyyaml
+
 pssh -I tee /tmp/postprep.py <<EOF
 #!/usr/bin/env python
 import os
+import platform
 import sys
 import time
 import urllib
@@ -95,7 +98,7 @@ system("sudo systemctl start docker || true")
 system("sudo pip install -U docker-compose=={}".format(COMPOSE_VERSION))
 
 ### Install docker-machine
-system("sudo curl -sSL -o /usr/local/bin/docker-machine https://github.com/docker/machine/releases/download/v{}/docker-machine-$(uname -s)-$(uname -m)".format(MACHINE_VERSION))
+system("sudo curl -sSL -o /usr/local/bin/docker-machine https://github.com/docker/machine/releases/download/v{}/docker-machine-{}-{}".format(MACHINE_VERSION, platform.system(), platform.machine()))
 system("sudo chmod +x /usr/local/bin/docker-machine*")
 
 system("sudo apt-get remove -y --purge dnsmasq-base")
diff --git a/prepare-vms/settings/rc.yaml b/prepare-vms/settings/rc.yaml
new file mode 100644
index 00000000..1ea6fb45
--- /dev/null
+++ b/prepare-vms/settings/rc.yaml
@@ -0,0 +1,35 @@
+# This file is passed by trainer-cli to scripts/ips-txt-to-html.py
+
+workshop_name: Advanced Docker Orchestration
+workshop_short_name: orchestration
+repo: https://github.com/jpetazzo/orchestration-workshop
+
+instance_login: docker
+instance_password: training
+
+clustersize: 5  # Number of VMs per cluster
+pagesize: 15    # Number of cards to print per page
+
+#background_image: https://myapps.developer.ubuntu.com/site_media/appmedia/2014/12/swarm.png
+background_image: http://www.yellosoft.us/public/images/docker.png
+#background_image: ../media/swarm.png
+
+# To be printed on the cards:
+blurb: >
+    Here is the connection information to your very own 
+       {cluster_or_machine} for this {workshop_name} workshop. You can connect 
+       to {this_or_each} VM with any SSH client.
+
+       Your {machine_is_or_machines_are}:
+
+# {url} will be replaced by the script
+footer: >
+    <p>For slides, chat and other useful links, see: </p>
+    <center>{url}</center>
+
+url: http://container.training/
+
+engine_version: test.docker.com
+compose_version: 1.7.0rc1
+machine_version: 0.7.0-rc1
+swarm_version: 1.2.0-rc1