From 74495c9ab577c309580e36625ba01d98815cd8f5 Mon Sep 17 00:00:00 2001
From: deniseschannon <denise@rancher.com>
Date: Wed, 23 Nov 2016 22:50:25 -0800
Subject: [PATCH 1/2] Move mesos/swarm to infra-templates

---
 infra-templates/mesos/0/docker-compose.yml  |  48 ++++++++
 infra-templates/mesos/0/rancher-compose.yml |  31 +++++
 infra-templates/mesos/catalogIcon-mesos.svg |  76 ++++++++++++
 infra-templates/mesos/config.yml            |   3 +
 infra-templates/swarm/0/docker-compose.yml  |  23 ++++
 infra-templates/swarm/0/rancher-compose.yml |  24 ++++
 infra-templates/swarm/README.md             |  20 ++++
 infra-templates/swarm/catalogIcon-swarm.svg | 124 ++++++++++++++++++++
 infra-templates/swarm/config.yml            |   5 +
 9 files changed, 354 insertions(+)
 create mode 100644 infra-templates/mesos/0/docker-compose.yml
 create mode 100644 infra-templates/mesos/0/rancher-compose.yml
 create mode 100644 infra-templates/mesos/catalogIcon-mesos.svg
 create mode 100644 infra-templates/mesos/config.yml
 create mode 100644 infra-templates/swarm/0/docker-compose.yml
 create mode 100644 infra-templates/swarm/0/rancher-compose.yml
 create mode 100644 infra-templates/swarm/README.md
 create mode 100644 infra-templates/swarm/catalogIcon-swarm.svg
 create mode 100644 infra-templates/swarm/config.yml

diff --git a/infra-templates/mesos/0/docker-compose.yml b/infra-templates/mesos/0/docker-compose.yml
new file mode 100644
index 0000000..bf4c5c7
--- /dev/null
+++ b/infra-templates/mesos/0/docker-compose.yml
@@ -0,0 +1,48 @@
+zookeeper:
+  image: rancher/zookeeper:3.4.8
+  environment:
+    ZK_ENSEMBLE_SIZE: 3
+    JVMFLAGS: -Xmx512m -Xms512m
+    CONFD_INTERVAL: 0
+  labels:
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    io.rancher.sidekicks: zookeeper-data
+  volumes_from:
+  - zookeeper-data
+zookeeper-data:
+  image: busybox
+  entrypoint: /bin/true
+  labels:
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    io.rancher.container.start_once: 'true'
+  net: none
+  volumes:
+  - /data
+mesos-master:
+  image: rancher/mesos-master:latest
+  environment:
+    MESOS_CLUSTER: Rancher
+    MESOS_QUORUM: 2
+    MASTER_PORT: 5050
+    ZK_SERVICE: Mesos/zookeeper
+    ZK_SESSION_TIMEOUT: 10secs
+  ports:
+  - "5050:5050"
+  labels:
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+  volumes:
+  - /data
+mesos-slave:
+  image: rancher/mesos-slave:latest
+  environment:
+    SLAVE_PORT: 5051
+    ZK_SERVICE: Mesos/zookeeper
+  ports:
+  - "5051:5051"
+  labels:
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    io.rancher.scheduler.global: "true"
+  volumes:
+  - /var/run/docker.sock:/var/run/docker.sock
+  - /data
+  privileged: true
diff --git a/infra-templates/mesos/0/rancher-compose.yml b/infra-templates/mesos/0/rancher-compose.yml
new file mode 100644
index 0000000..203eb40
--- /dev/null
+++ b/infra-templates/mesos/0/rancher-compose.yml
@@ -0,0 +1,31 @@
+.catalog:
+  version: v0.28.0
+
+zookeeper:
+  scale: 3
+  retain_ip: true
+  health_check:
+    port: 2181
+    interval: 5000
+    unhealthy_threshold: 3
+    request_line: ''
+    healthy_threshold: 2
+    response_timeout: 5000
+mesos-master:
+  scale: 3
+  retain_ip: true
+  health_check:
+    port: 5050
+    interval: 3000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/metrics/snapshot'
+    response_timeout: 2000
+mesos-slave:
+  health_check:
+    port: 5051
+    interval: 5000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: ''
+    response_timeout: 3000
diff --git a/infra-templates/mesos/catalogIcon-mesos.svg b/infra-templates/mesos/catalogIcon-mesos.svg
new file mode 100644
index 0000000..eb0e3d8
--- /dev/null
+++ b/infra-templates/mesos/catalogIcon-mesos.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-345 257 100 100" style="enable-background:new -345 257 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#00435A;}
+	.st1{fill:#00AEDE;}
+	.st2{fill:#394D54;}
+</style>
+<g>
+	<path class="st0" d="M-281.5,306v-13.8l-11.9,6.9L-281.5,306"/>
+	<path class="st1" d="M-282.2,290.8l-11.9-6.9v13.8L-282.2,290.8"/>
+	<path class="st1" d="M-295.7,297.7v-13.8l-12,6.9L-295.7,297.7"/>
+	<path class="st1" d="M-296.5,282.6l-11.9-6.9v13.9L-296.5,282.6"/>
+	<path class="st0" d="M-282.2,307.3l-11.9-6.9v13.8L-282.2,307.3"/>
+	<path class="st0" d="M-295.7,314.3v-13.8l-12,6.9L-295.7,314.3"/>
+	<path class="st1" d="M-267.9,299.1l-12-6.9V306L-267.9,299.1"/>
+	<path class="st1" d="M-310,289.5v-13.9l-12,6.9L-310,289.5"/>
+	<path class="st0" d="M-296.5,315.6l-11.9-6.9v13.8L-296.5,315.6"/>
+	<path class="st1" d="M-310,322.5v-13.8l-12,6.9L-310,322.5"/>
+	<path class="st0" d="M-296.5,299.1l-11.9-6.9V306L-296.5,299.1"/>
+	<path class="st1" d="M-281.5,289.5v-13.9l-11.9,6.9L-281.5,289.5"/>
+	<path class="st0" d="M-294.2,267.4v13.8l11.9-6.9L-294.2,267.4"/>
+	<path class="st0" d="M-307.7,274.3l12,6.9v-13.8L-307.7,274.3"/>
+	<path class="st0" d="M-282.2,323.8l-11.9-6.9v13.8L-282.2,323.8"/>
+	<path class="st0" d="M-295.7,330.8v-13.8l-12,6.9L-295.7,330.8"/>
+	<path class="st1" d="M-267.2,314.3v-13.8l-11.9,6.9L-267.2,314.3"/>
+	<path class="st1" d="M-310,306v-13.9l-12,6.9L-310,306"/>
+	<path class="st1" d="M-310.8,307.3l-12.1-6.9v13.8L-310.8,307.3"/>
+	<path class="st1" d="M-267.2,297.7v-13.8l-11.9,6.9L-267.2,297.7"/>
+	<path class="st1" d="M-267.9,282.6l-12-6.9v13.9L-267.9,282.6"/>
+	<path class="st1" d="M-267.9,315.6l-12-6.9v13.8L-267.9,315.6"/>
+	<path class="st0" d="M-281.5,322.5v-13.8l-11.9,6.9L-281.5,322.5"/>
+	<path class="st1" d="M-310.8,290.8l-12.1-6.9v13.8L-310.8,290.8"/>
+</g>
+<g>
+	<path class="st2" d="M-306.3,333.9v13.7h-2.3v-8.9c0-0.4,0-0.7,0.1-1.1l-4.2,7.8c-0.2,0.4-0.5,0.6-0.9,0.6h-0.4
+		c-0.4,0-0.7-0.2-0.9-0.6l-4.2-7.8c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.6v8.9h-2.3v-13.7h1.9c0.1,0,0.2,0,0.3,0c0.1,0,0.2,0,0.2,0
+		c0.1,0,0.1,0.1,0.2,0.1c0.1,0.1,0.1,0.1,0.2,0.2l4.1,7.6c0.1,0.2,0.2,0.4,0.3,0.6c0.1,0.2,0.2,0.4,0.3,0.7c0.1-0.2,0.2-0.5,0.3-0.7
+		c0.1-0.2,0.2-0.4,0.3-0.6l4.1-7.6c0.1-0.1,0.1-0.2,0.2-0.2c0.1-0.1,0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.3,0H-306.3z"
+		/>
+	<path class="st2" d="M-302.1,343c0,0.5,0.1,0.9,0.3,1.3s0.3,0.7,0.6,0.9c0.2,0.2,0.5,0.4,0.8,0.5s0.7,0.2,1,0.2c0.4,0,0.7,0,1-0.1
+		s0.5-0.2,0.7-0.3c0.2-0.1,0.4-0.2,0.5-0.3c0.2-0.1,0.3-0.1,0.5-0.1c0.2,0,0.3,0.1,0.4,0.2l0.7,0.9c-0.3,0.3-0.6,0.6-0.9,0.8
+		c-0.3,0.2-0.7,0.4-1,0.5c-0.4,0.1-0.7,0.2-1.1,0.3c-0.4,0.1-0.7,0.1-1.1,0.1c-0.7,0-1.3-0.1-1.9-0.3c-0.6-0.2-1.1-0.6-1.5-1
+		c-0.4-0.4-0.8-1-1-1.6s-0.4-1.4-0.4-2.3c0-0.7,0.1-1.3,0.3-1.9c0.2-0.6,0.5-1.1,0.9-1.5c0.4-0.4,0.9-0.8,1.5-1
+		c0.6-0.3,1.2-0.4,2-0.4c0.6,0,1.2,0.1,1.7,0.3c0.5,0.2,1,0.5,1.3,0.9c0.4,0.4,0.7,0.8,0.9,1.4c0.2,0.5,0.3,1.2,0.3,1.9
+		c0,0.4,0,0.6-0.1,0.7c-0.1,0.1-0.2,0.2-0.4,0.2H-302.1z M-297.6,341.6c0-0.3,0-0.6-0.1-0.9c-0.1-0.3-0.2-0.5-0.4-0.7
+		c-0.2-0.2-0.4-0.4-0.7-0.5c-0.3-0.1-0.6-0.2-0.9-0.2c-0.7,0-1.2,0.2-1.6,0.6c-0.4,0.4-0.6,0.9-0.7,1.6H-297.6z"/>
+	<path class="st2" d="M-287.8,339.8c-0.1,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.4-0.1
+		c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.2-0.6-0.2s-0.5-0.1-0.8-0.1c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.2-0.4,0.5-0.4,0.8
+		c0,0.2,0.1,0.4,0.2,0.5c0.1,0.1,0.3,0.3,0.5,0.4c0.2,0.1,0.5,0.2,0.8,0.3c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.6,0.2,0.9,0.3
+		c0.3,0.1,0.5,0.3,0.8,0.5c0.2,0.2,0.4,0.4,0.5,0.7c0.1,0.3,0.2,0.6,0.2,1c0,0.5-0.1,0.9-0.3,1.3c-0.2,0.4-0.4,0.7-0.7,1
+		c-0.3,0.3-0.7,0.5-1.2,0.7c-0.5,0.2-1,0.2-1.7,0.2c-0.3,0-0.7,0-1-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.3-0.1-0.6-0.2-0.8-0.4
+		c-0.2-0.1-0.5-0.3-0.7-0.5l0.5-0.9c0.1-0.1,0.2-0.2,0.2-0.2c0.1-0.1,0.2-0.1,0.4-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0.1,0.3,0.2,0.5,0.3
+		c0.2,0.1,0.4,0.2,0.6,0.3c0.2,0.1,0.5,0.1,0.9,0.1c0.3,0,0.5,0,0.7-0.1c0.2-0.1,0.4-0.2,0.5-0.3c0.1-0.1,0.2-0.2,0.3-0.4
+		s0.1-0.3,0.1-0.4c0-0.2-0.1-0.4-0.2-0.6c-0.1-0.1-0.3-0.3-0.5-0.4c-0.2-0.1-0.5-0.2-0.8-0.3c-0.3-0.1-0.6-0.2-0.9-0.3
+		c-0.3-0.1-0.6-0.2-0.9-0.4c-0.3-0.1-0.5-0.3-0.8-0.5s-0.4-0.5-0.5-0.8c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.4,0.1-0.8,0.2-1.1
+		c0.2-0.4,0.4-0.7,0.7-0.9s0.7-0.5,1.2-0.6c0.5-0.2,1-0.2,1.6-0.2c0.7,0,1.3,0.1,1.8,0.3s1,0.5,1.4,0.9L-287.8,339.8z"/>
+	<path class="st2" d="M-281.1,337.7c0.7,0,1.4,0.1,2,0.4c0.6,0.2,1.1,0.6,1.5,1c0.4,0.4,0.7,1,1,1.6c0.2,0.6,0.3,1.3,0.3,2.1
+		c0,0.8-0.1,1.5-0.3,2.1c-0.2,0.6-0.6,1.1-1,1.6c-0.4,0.4-0.9,0.8-1.5,1c-0.6,0.2-1.2,0.4-2,0.4c-0.7,0-1.4-0.1-2-0.4
+		c-0.6-0.2-1.1-0.6-1.5-1c-0.4-0.4-0.7-1-1-1.6c-0.2-0.6-0.3-1.3-0.3-2.1c0-0.8,0.1-1.5,0.3-2.1c0.2-0.6,0.6-1.1,1-1.6
+		c0.4-0.4,0.9-0.8,1.5-1C-282.5,337.8-281.8,337.7-281.1,337.7z M-281.1,346c0.8,0,1.4-0.3,1.8-0.8s0.6-1.3,0.6-2.4
+		c0-1.1-0.2-1.9-0.6-2.4c-0.4-0.6-1-0.8-1.8-0.8c-0.8,0-1.4,0.3-1.8,0.8c-0.4,0.6-0.6,1.4-0.6,2.4c0,1,0.2,1.8,0.6,2.4
+		C-282.5,345.7-281.9,346-281.1,346z"/>
+	<path class="st2" d="M-268.5,339.8c-0.1,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.4-0.1
+		c-0.1-0.1-0.3-0.1-0.5-0.2s-0.4-0.2-0.6-0.2s-0.5-0.1-0.8-0.1c-0.5,0-0.8,0.1-1.1,0.3s-0.4,0.5-0.4,0.8c0,0.2,0.1,0.4,0.2,0.5
+		c0.1,0.1,0.3,0.3,0.5,0.4c0.2,0.1,0.5,0.2,0.8,0.3c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.3,0.8,0.5
+		c0.2,0.2,0.4,0.4,0.5,0.7c0.1,0.3,0.2,0.6,0.2,1c0,0.5-0.1,0.9-0.3,1.3c-0.2,0.4-0.4,0.7-0.7,1s-0.7,0.5-1.2,0.7
+		c-0.5,0.2-1,0.2-1.7,0.2c-0.3,0-0.7,0-1-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.3-0.1-0.6-0.2-0.8-0.4c-0.3-0.1-0.5-0.3-0.7-0.5l0.5-0.9
+		c0.1-0.1,0.2-0.2,0.2-0.2c0.1-0.1,0.2-0.1,0.4-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.3
+		c0.2,0.1,0.5,0.1,0.9,0.1c0.3,0,0.5,0,0.7-0.1c0.2-0.1,0.4-0.2,0.5-0.3s0.2-0.2,0.3-0.4c0.1-0.1,0.1-0.3,0.1-0.4
+		c0-0.2-0.1-0.4-0.2-0.6c-0.1-0.1-0.3-0.3-0.5-0.4c-0.2-0.1-0.5-0.2-0.8-0.3c-0.3-0.1-0.6-0.2-0.9-0.3c-0.3-0.1-0.6-0.2-0.9-0.4
+		c-0.3-0.1-0.5-0.3-0.8-0.5s-0.4-0.5-0.5-0.8c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.4,0.1-0.8,0.2-1.1s0.4-0.7,0.7-0.9
+		c0.3-0.3,0.7-0.5,1.1-0.6c0.5-0.2,1-0.2,1.6-0.2c0.7,0,1.3,0.1,1.8,0.3s1,0.5,1.4,0.9L-268.5,339.8z"/>
+</g>
+</svg>
diff --git a/infra-templates/mesos/config.yml b/infra-templates/mesos/config.yml
new file mode 100644
index 0000000..68f8324
--- /dev/null
+++ b/infra-templates/mesos/config.yml
@@ -0,0 +1,3 @@
+name: Mesos
+version: v0.28.0
+category: Orchestration
diff --git a/infra-templates/swarm/0/docker-compose.yml b/infra-templates/swarm/0/docker-compose.yml
new file mode 100644
index 0000000..9fcbc85
--- /dev/null
+++ b/infra-templates/swarm/0/docker-compose.yml
@@ -0,0 +1,23 @@
+version: '2'
+services:
+  swarmkit-mon:
+    image: llparse/swarmkit:v1.12-4
+    environment:
+      MANAGER_SCALE: ${MANAGER_SCALE}
+    labels:
+      io.rancher.container.agent.role: environment
+      io.rancher.container.create_agent: 'true'
+      io.rancher.container.dns: 'true'
+      io.rancher.container.pull_image: always
+      io.rancher.scheduler.affinity:host_label: io.rancher.host.docker_version=1.12
+      io.rancher.scheduler.global: 'true'
+    network_mode: host
+    privileged: true
+    volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+    - /var/lib/rancher/state:/var/lib/rancher/state
+    logging:
+      driver: json-file
+      options:
+        max-size: 25m
+        max-file: '2'
diff --git a/infra-templates/swarm/0/rancher-compose.yml b/infra-templates/swarm/0/rancher-compose.yml
new file mode 100644
index 0000000..8ee9982
--- /dev/null
+++ b/infra-templates/swarm/0/rancher-compose.yml
@@ -0,0 +1,24 @@
+.catalog:
+  version: v1.12-rancher0
+  minimum_rancher_version: 1.1.99
+  questions:
+  - variable: MANAGER_SCALE
+    label: Number of Managers
+    description: Desired number of managers to participating in service orchestration. This dictates host resilience.
+    required: true
+    default: 3
+    type: enum
+    options:
+    - 1
+    - 3
+    - 5
+    - 7
+    - 9
+swarmkit-mon:
+  health_check:
+    request_line: GET /ping HTTP/1.0
+    port: 2378
+    interval: 15000
+    response_timeout: 10000
+    healthy_threshold: 1
+    unhealthy_threshold: 2
diff --git a/infra-templates/swarm/README.md b/infra-templates/swarm/README.md
new file mode 100644
index 0000000..614a4d1
--- /dev/null
+++ b/infra-templates/swarm/README.md
@@ -0,0 +1,20 @@
+## Prerequisites
+
+* Port `2377` and `2378` must be open
+* Docker v1.12.1 installed
+
+SwarmKit's overlay network configuration must determine which interface will be used for cross-host communication. By default, Rancher routes traffic over public IP addresses. Swarm can't always detect the corresponding interface; you may need to do one of the following:
+
+* Register hosts with CATTLE_AGENT_IP environment variable set to a system address
+* Specify the host interface for Swarm to listen on (hosts must have the same interface name)
+
+## Features
+
+* Automatically scale up/down a Swarm by adding/removing hosts to an environment
+  * Do not attempt to run `docker swarm` commands manually
+* Configurable number of managers tunable to desired [failure tolerance](https://docs.docker.com/engine/swarm/admin_guide/#/add-manager-nodes-for-fault-tolerance)
+* Reconciliation logic promotes/demotes managers/workers to maintain resilience
+
+## Limitations
+
+* Swarm over public networks is not supported in Docker 1.12.3 and older
\ No newline at end of file
diff --git a/infra-templates/swarm/catalogIcon-swarm.svg b/infra-templates/swarm/catalogIcon-swarm.svg
new file mode 100644
index 0000000..9e51aa8
--- /dev/null
+++ b/infra-templates/swarm/catalogIcon-swarm.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#95A5A6;}
+	.st1{fill:#0075A8;}
+	.st2{fill:#0EB7ED;}
+	.st3{fill:#D3EDF1;}
+	.st4{fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+	.st5{fill:none;}
+	.st6{fill:#394D54;}
+	.st7{fill:#39B7E1;}
+	.st8{fill:#FFFFFF;}
+	.st9{fill:#336EE5;}
+	.st10{fill:none;stroke:#FFFFFF;stroke-width:0.2744;}
+	.st11{fill:#373535;}
+	.st12{fill:#0074AA;}
+	.st13{fill:#00C8FA;}
+	.st14{fill:#00A9D2;}
+	.st15{opacity:0.5;fill:#0EB7ED;}
+</style>
+<g id="Layer_2">
+</g>
+<g id="Layer_1">
+	<path class="st2" d="M24.9,48.7c-3.3,1.3-7.3,5.3-1.6,13.8s21.6,6.8,28.9-2.5c5.6-7.2,5.8-8.7,7.1-9.9c2.5,0.6,5.5-0.7,6.4-3.4
+		c0,0-3.1-2.9-6.5,0.4c0,0,1.8-2,0.4-3.8L24.9,48.7z"/>
+	<path class="st3" d="M20.8,57.5c1.1,0.8,7.8,3.3,15.3-1.3c0,0-2.5,9.1,7.9,9.8c0,0-9,4-15.9,0.6S20.8,57.5,20.8,57.5z"/>
+	<path class="st4" d="M59.5,43.4c1.4,1.8-0.4,3.8-0.4,3.8c3.4-3.2,6.5-0.4,6.5-0.4c-0.9,2.6-3.9,3.9-6.4,3.4
+		c-1.3,1.2-1.5,2.7-7.1,9.9c-7.2,9.3-23.2,11-28.9,2.5s-1.8-12.9,1.6-13.8"/>
+	<path class="st4" d="M20.8,57.3c1.5,1.6,10.1,2.3,16-1.6"/>
+	<path class="st2" d="M74,52.1c0,0,1.8-2,0.4-3.8l-34.6,5.3c-3.3,1.3-7.3,5.3-1.6,13.8C44,76,59.9,74.4,67.1,65
+		c5.6-7.2,5.8-8.7,7.1-9.9c2.5,0.6,5.5-0.7,6.4-3.4C80.6,51.8,77.5,48.9,74,52.1z M67.7,54.3l3.1-2c0.6,1.1,0.9,1.4,1.1,1.6
+		C71.9,53.9,69.8,54.9,67.7,54.3z"/>
+	<path class="st2" d="M41.9,29.5c3.9,0,5.9-3.8,5.9-3.8c-4.9-1.5-3.8-7.4-3.8-7.4c4.2,0.9,4.8,4.1,4.8,4.1c0.2-4.2,4.8-4.6,4.8-4.6
+		c1.9,5.2-2.8,7.4-2.8,7.4s1.1,7.9,0.8,11.6c-0.1,1.7-3.9,15.9-19.6,14.7S16.9,36.4,19,34.4c1-0.9,4.7-2.5,9.5-3"/>
+	<path class="st3" d="M18.4,41.5c1.1,0.8,7.3,2.9,14.7-1.8c0,0-2,9.5,8.5,10.3c0,0-9,4-15.9,0.6S18.4,41.5,18.4,41.5z"/>
+	<path class="st4" d="M18.2,41.2c1.5,1.6,10.1,2,15.9-1.9"/>
+	<path class="st4" d="M41.4,29.8c3.9,0,6.3-3.7,6.3-3.7c-4.9-1.5-3.8-7.4-3.8-7.4c4.2,0.9,4.8,4.1,4.8,4.1c0.2-4.2,4.8-4.6,4.8-4.6
+		c1.9,5.2-2.8,7.4-2.8,7.4s1.3,6.6,0.8,11.6c-0.2,2.7-3.9,15.9-19.6,14.7s-15-15.3-13-17.3c1-1,4.5-3,9.5-3.3"/>
+	<path class="st2" d="M31,37.4c-2.1,1.9-2.7,16.1,13,17.3s19.4-13,19.6-14.7c0.3-3.7-0.8-11.6-0.8-11.6s4.8-2.2,2.8-7.4
+		c0,0-4.6,0.3-4.8,4.6c0,0-0.5-3.2-4.8-4.1c0,0-1.1,5.9,3.8,7.4c0,0-2,3.8-5.9,3.8"/>
+	<path class="st3" d="M30.5,44.5c1.1,0.8,7.3,2.9,14.7-1.8c0,0-2,9.5,8.5,10.3c0,0-9.1,3.6-16,0.2C30.7,49.8,30.5,44.5,30.5,44.5z"
+		/>
+	<path class="st4" d="M30.2,44.2c1.5,1.6,10.1,2,15.9-1.9"/>
+	<path class="st4" d="M53.5,32.5c3.9,0,6.3-3.7,6.3-3.7c-4.9-1.5-3.8-7.4-3.8-7.4c4.2,0.9,4.8,4.1,4.8,4.1c0.2-4.2,4.8-4.6,4.8-4.6
+		c1.9,5.2-2.8,7.4-2.8,7.4S64,35,63.5,40c-0.2,2.7-3.9,15.9-19.6,14.7S29,39.4,31,37.4c0.5-0.5,1.4-1,4.1-1.2"/>
+	<path class="st2" d="M45,38.4c-2.1,1.9-2.7,16.1,13,17.3s19-13.8,19.2-15.5c0.3-3.7-0.4-10.8-0.4-10.8s4.8-2.2,2.8-7.4
+		c0,0-4.6,0.3-4.8,4.6c0,0-0.5-3.2-4.8-4.1c0,0-1.1,5.9,3.8,7.4c0,0-2,3.8-5.9,3.8"/>
+	<path class="st4" d="M70.7,52.3c0.6,1.1,0.9,1.4,1.1,1.6c0,0-2.1,1-4.2,0.4"/>
+	<polygon class="st13" points="28.8,23.9 28.8,34.7 47.8,39 67.8,34 67.8,12.1 50.3,10.4 38.8,11.8 38.8,21.9 	"/>
+	<polygon class="st14" points="67.5,12 67.5,34 47.5,39.5 47.5,27 57.5,25.2 57.5,14 	"/>
+	<polyline class="st4" points="28.5,23.9 47.6,26.8 67.5,23.3 	"/>
+	<polyline class="st4" points="38.5,11.8 57.5,13.9 67.5,12.3 	"/>
+	<line class="st4" x1="57.5" y1="14" x2="57.5" y2="36.5"/>
+	<line class="st4" x1="47.5" y1="27" x2="47.5" y2="39"/>
+	<line class="st4" x1="57.5" y1="25.1" x2="38.5" y2="21.9"/>
+	<g>
+		<path class="st8" d="M64,45.1c-0.4,0-0.9-0.1-1.3-0.2c-1.3-0.5-2.1-1.7-1.8-3c0.3-1.6,1.6-2.5,3.3-2.5c0.9,0,1.7,0.3,2.2,0.8
+			c0.5,0.5,0.7,1.2,0.7,2.1C67.1,44.1,65.6,45.1,64,45.1L64,45.1z"/>
+		<path d="M64.3,39.6c1.7,0,2.7,1,2.6,2.6c-0.1,1.7-1.4,2.6-2.9,2.6c-0.4,0-0.8-0.1-1.2-0.2c-1.1-0.4-1.9-1.5-1.7-2.7
+			C61.5,40.4,62.8,39.6,64.3,39.6 M64.3,39.1c-1.9,0-3.3,1.1-3.6,2.7c-0.3,1.4,0.5,2.7,2,3.2c0.4,0.2,0.9,0.2,1.3,0.2
+			c1.6,0,3.3-1.1,3.4-3.1c0-0.9-0.2-1.7-0.8-2.3C66.1,39.4,65.3,39.1,64.3,39.1L64.3,39.1z"/>
+	</g>
+	<path d="M63.4,39.8c-1.1,0-2.1,0.6-2.3,1.7c-0.2,0.9,0.4,1.7,1.2,2c1.3,0.5,2.9-0.2,3-1.8C65.4,40.5,64.7,39.8,63.4,39.8z"/>
+	<g>
+		<path class="st8" d="M55.8,62.8c-0.5,0-0.9-0.1-1.4-0.2c-1.4-0.5-2.2-1.8-2-3.2c0.3-1.7,1.7-2.8,3.6-2.8c1,0,1.8,0.3,2.4,0.9
+			c0.5,0.5,0.8,1.3,0.8,2.3C59.1,61.7,57.4,62.8,55.8,62.8L55.8,62.8z"/>
+		<path d="M56.1,56.8c1.8,0,2.9,1,2.9,2.9c-0.1,1.8-1.5,2.9-3.1,2.9c-0.4,0-0.9-0.1-1.3-0.2c-1.3-0.5-2.1-1.6-1.8-2.9
+			C53,57.6,54.4,56.8,56.1,56.8 M56.1,56.3c-2,0-3.5,1.2-3.9,3c-0.3,1.5,0.6,2.9,2.1,3.5c0.5,0.2,1,0.3,1.5,0.3
+			c1.8,0,3.6-1.1,3.6-3.3c0-1-0.3-1.9-0.8-2.5C58,56.6,57.1,56.3,56.1,56.3L56.1,56.3z"/>
+	</g>
+	<path d="M54.5,56.9c-1,0.2-1.4,0.8-1.6,1.8c-0.1,0.8,0.3,1.5,1.1,1.8c1.2,0.4,2.5-0.2,2.7-1.6C57,57.5,55.8,56.7,54.5,56.9z"/>
+	<path class="st3" d="M44.3,45.4c1.1,0.8,7.8,3,15.2-1.7c0,0-2,9.5,8.5,10.3c0,0-9.4,3.6-16.3,0.2C44.8,50.8,44.3,45.4,44.3,45.4z"
+		/>
+	<path class="st3" d="M35.8,62.5c1.1,0.8,7.9,2.9,15.4-1.8c0,0-2.6,9.5,7.8,10.3c0,0-9,4-15.9,0.6S35.8,62.5,35.8,62.5z"/>
+	<path class="st4" d="M44.2,45.2c1.5,1.6,10.1,2,15.9-1.9"/>
+	<path class="st4" d="M45,38.4c-2.1,1.9-2.7,16.1,13,17.3s18.9-12.8,19.2-15.5c0.5-5-0.4-10.8-0.4-10.8s4.8-2.2,2.8-7.4
+		c0,0-4.6,0.3-4.8,4.6c0,0-0.5-3.2-4.8-4.1c0,0-1.1,5.9,3.8,7.4c0,0-2.4,3.7-6.3,3.7"/>
+	<path class="st4" d="M74.1,48.4c1.4,1.8,0,3.8,0,3.8c3.4-3.2,6.5-0.4,6.5-0.4c-0.9,2.6-3.9,3.9-6.4,3.4c-1.3,1.2-1.5,2.7-7.1,9.9
+		c-7.2,9.3-23.5,11.2-28.9,2.5c-5-8.2-2.4-12.7,1.1-13.7"/>
+	<path class="st4" d="M36,62.7c1.7,1.6,9.9,1.7,15.7-2.3"/>
+	<g>
+		<path class="st6" d="M28.3,78.8c-0.1,0.1-0.2,0.2-0.3,0.3c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.3-0.1-0.5-0.2
+			c-0.2-0.1-0.4-0.2-0.6-0.3c-0.2-0.1-0.5-0.2-0.8-0.3c-0.3-0.1-0.7-0.2-1.1-0.2c-0.4,0-0.7,0-1,0.1c-0.3,0.1-0.5,0.2-0.7,0.4
+			s-0.3,0.4-0.4,0.6c-0.1,0.2-0.1,0.5-0.1,0.7c0,0.3,0.1,0.6,0.3,0.9c0.2,0.2,0.4,0.4,0.8,0.6c0.3,0.2,0.7,0.3,1.1,0.4
+			s0.8,0.3,1.2,0.4s0.8,0.3,1.2,0.5c0.4,0.2,0.8,0.4,1.1,0.7c0.3,0.3,0.6,0.6,0.8,1.1c0.2,0.4,0.3,0.9,0.3,1.5
+			c0,0.7-0.1,1.3-0.3,1.8c-0.2,0.6-0.5,1.1-1,1.5c-0.4,0.4-1,0.8-1.6,1s-1.3,0.4-2.1,0.4c-0.5,0-0.9,0-1.4-0.1
+			c-0.4-0.1-0.9-0.2-1.3-0.4c-0.4-0.2-0.8-0.4-1.2-0.6s-0.7-0.5-1-0.8l0.8-1.3c0.1-0.1,0.2-0.2,0.3-0.2c0.1-0.1,0.2-0.1,0.3-0.1
+			c0.2,0,0.3,0.1,0.5,0.2s0.4,0.3,0.7,0.5c0.3,0.2,0.6,0.3,0.9,0.5c0.4,0.1,0.8,0.2,1.3,0.2c0.8,0,1.4-0.2,1.8-0.5s0.6-0.9,0.6-1.6
+			c0-0.4-0.1-0.7-0.3-0.9c-0.2-0.2-0.4-0.4-0.8-0.6c-0.3-0.2-0.7-0.3-1.1-0.4s-0.8-0.2-1.2-0.4c-0.4-0.1-0.8-0.3-1.2-0.5
+			c-0.4-0.2-0.8-0.4-1.1-0.7c-0.3-0.3-0.6-0.7-0.8-1.1c-0.2-0.5-0.3-1-0.3-1.7c0-0.5,0.1-1,0.3-1.5c0.2-0.5,0.5-0.9,0.9-1.3
+			c0.4-0.4,0.9-0.7,1.5-0.9c0.6-0.2,1.3-0.4,2-0.4c0.9,0,1.6,0.1,2.4,0.4c0.7,0.3,1.3,0.6,1.8,1.1L28.3,78.8z"/>
+		<path class="st6" d="M45.5,80.3l-3.3,10.3h-2c-0.2,0-0.4-0.1-0.5-0.4l-1.8-5.9c-0.1-0.2-0.1-0.4-0.2-0.6c0-0.2-0.1-0.4-0.1-0.6
+			c0,0.2-0.1,0.4-0.1,0.6s-0.1,0.4-0.2,0.6l-1.9,5.9c-0.1,0.3-0.3,0.4-0.5,0.4h-1.9l-3.2-10.3h2c0.2,0,0.3,0,0.5,0.1
+			s0.2,0.2,0.2,0.3l1.5,5.5c0.1,0.3,0.1,0.6,0.2,0.9c0.1,0.3,0.1,0.6,0.1,0.9c0.1-0.3,0.2-0.6,0.2-0.9c0.1-0.3,0.2-0.6,0.3-0.9
+			l1.7-5.5c0-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.3-0.1,0.4-0.1h1.1c0.2,0,0.3,0,0.4,0.1c0.1,0.1,0.2,0.2,0.2,0.3l1.6,5.5
+			c0.1,0.3,0.2,0.6,0.2,0.9s0.2,0.6,0.2,0.9c0.1-0.6,0.2-1.1,0.4-1.8l1.5-5.5c0-0.1,0.1-0.2,0.2-0.3s0.3-0.1,0.4-0.1H45.5z"/>
+		<path class="st6" d="M46.5,81.8c1.2-1.1,2.6-1.6,4.3-1.6c0.6,0,1.1,0.1,1.6,0.3c0.5,0.2,0.9,0.5,1.2,0.8c0.3,0.3,0.6,0.8,0.7,1.3
+			s0.3,1,0.3,1.6v6.5h-1.1c-0.2,0-0.4,0-0.5-0.1c-0.1-0.1-0.2-0.2-0.3-0.4l-0.2-0.7c-0.3,0.2-0.5,0.4-0.8,0.6
+			c-0.2,0.2-0.5,0.3-0.8,0.4s-0.6,0.2-0.9,0.3c-0.3,0.1-0.6,0.1-1,0.1c-0.4,0-0.8-0.1-1.2-0.2c-0.4-0.1-0.7-0.3-0.9-0.5
+			s-0.5-0.5-0.6-0.9S46,88.4,46,88c0-0.3,0-0.5,0.1-0.8c0.1-0.3,0.2-0.5,0.4-0.7s0.5-0.5,0.8-0.7c0.3-0.2,0.7-0.4,1.2-0.5
+			s1-0.3,1.6-0.4c0.6-0.1,1.3-0.2,2.1-0.2v-0.6c0-0.7-0.1-1.2-0.4-1.5s-0.7-0.5-1.3-0.5c-0.4,0-0.7,0-1,0.1
+			c-0.3,0.1-0.5,0.2-0.7,0.3c-0.2,0.1-0.4,0.2-0.5,0.3C48.1,83,47.9,83,47.7,83c-0.2,0-0.3,0-0.4-0.1c-0.1-0.1-0.2-0.2-0.3-0.3
+			L46.5,81.8z M52.2,86.2c-0.7,0-1.3,0.1-1.8,0.2c-0.5,0.1-0.9,0.2-1.2,0.3c-0.3,0.1-0.5,0.3-0.6,0.5c-0.1,0.2-0.2,0.4-0.2,0.6
+			c0,0.4,0.1,0.7,0.4,0.9c0.3,0.2,0.6,0.3,1,0.3c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.5,1.1-0.8V86.2z"/>
+		<path class="st6" d="M59.2,82.1c0.3-0.6,0.7-1.1,1.1-1.4c0.4-0.4,1-0.5,1.6-0.5c0.5,0,0.9,0.1,1.1,0.3l-0.2,1.8
+			c0,0.1-0.1,0.2-0.1,0.3s-0.1,0.1-0.3,0.1c-0.1,0-0.2,0-0.4,0c-0.2,0-0.4,0-0.6,0c-0.3,0-0.5,0-0.7,0.1c-0.2,0.1-0.4,0.2-0.6,0.3
+			c-0.2,0.1-0.3,0.3-0.5,0.5c-0.1,0.2-0.3,0.5-0.4,0.7v6.3h-2.5V80.3h1.5c0.3,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.3,0.2,0.5L59.2,82.1z"
+			/>
+		<path class="st6" d="M64.4,90.6V80.3h1.5c0.3,0,0.5,0.1,0.6,0.5l0.2,0.8c0.2-0.2,0.4-0.4,0.6-0.5c0.2-0.2,0.4-0.3,0.6-0.4
+			s0.5-0.2,0.7-0.3c0.3-0.1,0.5-0.1,0.8-0.1c0.6,0,1.2,0.2,1.6,0.5c0.4,0.3,0.7,0.8,0.9,1.4c0.2-0.3,0.4-0.6,0.6-0.9
+			s0.5-0.4,0.8-0.6c0.3-0.2,0.6-0.3,0.9-0.3s0.6-0.1,1-0.1c0.6,0,1.1,0.1,1.5,0.3c0.4,0.2,0.8,0.4,1.1,0.8c0.3,0.3,0.5,0.7,0.7,1.2
+			c0.2,0.5,0.2,1,0.2,1.6v6.5h-2.5v-6.5c0-0.7-0.1-1.1-0.4-1.5c-0.3-0.3-0.7-0.5-1.3-0.5c-0.3,0-0.5,0-0.7,0.1s-0.4,0.2-0.6,0.4
+			c-0.2,0.2-0.3,0.4-0.4,0.6c-0.1,0.2-0.1,0.5-0.1,0.8v6.5h-2.5v-6.5c0-0.7-0.1-1.2-0.4-1.5c-0.3-0.3-0.7-0.5-1.2-0.5
+			c-0.4,0-0.7,0.1-1,0.3c-0.3,0.2-0.6,0.4-0.9,0.7v7.5H64.4z"/>
+	</g>
+</g>
+<g id="Layer_3">
+	<path class="st15" d="M29.8,35.1c-1.4-0.3,3.9,0.9,3.9,0.9l-2,1C31.7,36.5,31.2,35.4,29.8,35.1z"/>
+	<path class="st15" d="M38.8,37c-3.9-0.8,6.2,1.3,6.2,1.3s-1.3,1.6-1.2,3.3C43.7,41.7,41.7,37.7,38.8,37z"/>
+	<polygon class="st4" points="28.5,23.9 28.5,34.7 47.5,39 67.5,34 67.5,12.3 50,10.4 38.5,11.8 38.5,21.9 	"/>
+</g>
+</svg>
diff --git a/infra-templates/swarm/config.yml b/infra-templates/swarm/config.yml
new file mode 100644
index 0000000..31c8ff0
--- /dev/null
+++ b/infra-templates/swarm/config.yml
@@ -0,0 +1,5 @@
+name: SwarmKit
+description: >
+  A toolkit for orchestrating distributed systems at any scale
+version: v1.12-rancher0
+category: Orchestration

From cf9afdd52424c49fe73b580f037c904e4ea4169e Mon Sep 17 00:00:00 2001
From: deniseschannon <denise@rancher.com>
Date: Fri, 25 Nov 2016 16:41:27 -0800
Subject: [PATCH 2/2] min version on mesos and swarm

---
 infra-templates/mesos/0/rancher-compose.yml | 2 +-
 infra-templates/swarm/0/rancher-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra-templates/mesos/0/rancher-compose.yml b/infra-templates/mesos/0/rancher-compose.yml
index 203eb40..c1308eb 100644
--- a/infra-templates/mesos/0/rancher-compose.yml
+++ b/infra-templates/mesos/0/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
   version: v0.28.0
-
+  minimum_rancher_version: 1.2.0-pre4-rc1
 zookeeper:
   scale: 3
   retain_ip: true
diff --git a/infra-templates/swarm/0/rancher-compose.yml b/infra-templates/swarm/0/rancher-compose.yml
index 8ee9982..30b5446 100644
--- a/infra-templates/swarm/0/rancher-compose.yml
+++ b/infra-templates/swarm/0/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
   version: v1.12-rancher0
-  minimum_rancher_version: 1.1.99
+  minimum_rancher_version: 1.2.0-pre4-rc1
   questions:
   - variable: MANAGER_SCALE
     label: Number of Managers