From c3e114ffbdbef83300629e5fea3def646b428d21 Mon Sep 17 00:00:00 2001
From: James Oliver <joliver@rancher.com>
Date: Wed, 30 Nov 2016 16:53:35 -0700
Subject: [PATCH] update swarmkit versions/readme

---
 infra-templates/swarm/0/docker-compose.yml  |  2 +-
 infra-templates/swarm/0/rancher-compose.yml |  6 +++---
 infra-templates/swarm/README.md             | 18 +++++++-----------
 infra-templates/swarm/config.yml            |  5 +++--
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/infra-templates/swarm/0/docker-compose.yml b/infra-templates/swarm/0/docker-compose.yml
index 9fcbc85..bc126e7 100644
--- a/infra-templates/swarm/0/docker-compose.yml
+++ b/infra-templates/swarm/0/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   swarmkit-mon:
-    image: llparse/swarmkit:v1.12-4
+    image: rancher/swarmkit:v1.12.3
     environment:
       MANAGER_SCALE: ${MANAGER_SCALE}
     labels:
diff --git a/infra-templates/swarm/0/rancher-compose.yml b/infra-templates/swarm/0/rancher-compose.yml
index 30b5446..a657055 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.2.0-pre4-rc1
+  version: v1.12.3
+  minimum_rancher_version: 1.1.3
   questions:
   - variable: MANAGER_SCALE
     label: Number of Managers
@@ -21,4 +21,4 @@ swarmkit-mon:
     interval: 15000
     response_timeout: 10000
     healthy_threshold: 1
-    unhealthy_threshold: 2
+    unhealthy_threshold: 2
\ No newline at end of file
diff --git a/infra-templates/swarm/README.md b/infra-templates/swarm/README.md
index 614a4d1..15878fa 100644
--- a/infra-templates/swarm/README.md
+++ b/infra-templates/swarm/README.md
@@ -1,20 +1,16 @@
 ## Prerequisites
 
+* Docker v1.12.1 to v1.12.3
 * 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)
+* Hosts are registered with `-e CATTLE_AGENT_IP=<private ip>` flag (IP address must be a system address)
 
 ## 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
+* Automatically scale up/down a Swarm by adding/removing hosts to/from an environment
+  * Please do not attempt to run `docker swarm` commands manually
+* Configurable number of managers tunable to desired [fault tolerance](https://docs.docker.com/engine/swarm/admin_guide/#/add-manager-nodes-for-fault-tolerance)
+  * Reconciliation promotes/demotes managers/workers to maintain fault tolerance
 
 ## Limitations
 
-* Swarm over public networks is not supported in Docker 1.12.3 and older
\ No newline at end of file
+* Swarm over public networks is not supported in Docker 1.12.3 and earlier
diff --git a/infra-templates/swarm/config.yml b/infra-templates/swarm/config.yml
index 31c8ff0..e12cfc3 100644
--- a/infra-templates/swarm/config.yml
+++ b/infra-templates/swarm/config.yml
@@ -1,5 +1,6 @@
-name: SwarmKit
+name: Docker SwarmKit
 description: >
   A toolkit for orchestrating distributed systems at any scale
-version: v1.12-rancher0
+version: v1.12.3
 category: Orchestration
+minimum_rancher_version: 1.1.3
\ No newline at end of file