From 1b5365d905274a22b1b4f2cbf1a3fdd09d6ddc62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Fri, 14 Apr 2017 15:39:24 -0500
Subject: [PATCH] Update settings; add security workshop

---
 prepare-vms/settings/orchestration.yaml |  2 +-
 prepare-vms/settings/rc.yaml            |  4 ++--
 prepare-vms/settings/sec.yml            | 32 +++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 prepare-vms/settings/sec.yml

diff --git a/prepare-vms/settings/orchestration.yaml b/prepare-vms/settings/orchestration.yaml
index fa453fad..d8113105 100644
--- a/prepare-vms/settings/orchestration.yaml
+++ b/prepare-vms/settings/orchestration.yaml
@@ -28,6 +28,6 @@ footer: >
 url: http://container.training/
 
 engine_version: get.docker.com
-compose_version: 1.11.2
+compose_version: 1.12.0
 machine_version: 0.10.0
 swarm_version: latest
diff --git a/prepare-vms/settings/rc.yaml b/prepare-vms/settings/rc.yaml
index e77d635c..943286b6 100644
--- a/prepare-vms/settings/rc.yaml
+++ b/prepare-vms/settings/rc.yaml
@@ -30,6 +30,6 @@ footer: >
 url: http://container.training/
 
 engine_version: test.docker.com
-compose_version: 1.9.0
-machine_version: 0.9.0-rc1
+compose_version: 1.12.0
+machine_version: 0.10.0
 swarm_version: latest
diff --git a/prepare-vms/settings/sec.yml b/prepare-vms/settings/sec.yml
new file mode 100644
index 00000000..e844940f
--- /dev/null
+++ b/prepare-vms/settings/sec.yml
@@ -0,0 +1,32 @@
+# 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: 3  # Number of VMs per cluster
+pagesize: 12    # Number of cards to print per page
+
+background_image: https://blog.docker.com/media/2015/08/notary.png
+
+# To be printed on the cards:
+blurb: >
+    Here is the connection information to your
+    three Docker nodes for the Security
+    Workshop. You can connect to each VM with
+    any SSH client.
+       
+    Your {machine_is_or_machines_are}:
+
+# {url} will be replaced by the script
+footer: ""
+
+url: http://container.training/
+
+engine_version: get.docker.com
+compose_version: 1.12.0
+machine_version: 0.10.0
+swarm_version: latest