bump template/image/affinity version

This commit is contained in:
James Oliver 2017-01-25 16:15:42 -07:00
parent 682fc4f884
commit 76fbc95f97
7 changed files with 48 additions and 4 deletions

View File

@ -0,0 +1,16 @@
## Prerequisites
* Docker v1.12.1 to v1.12.3
* Port `2377` and `2378` must be open
* 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/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 earlier

View File

@ -0,0 +1,16 @@
## Prerequisites
* Docker v1.12.1 to v1.12.3
* Port `2377` and `2378` must be open
* 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/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 earlier

View File

@ -0,0 +1,12 @@
## Prerequisites
* Docker 1.13.x
* Port `2377` and `2378` must be open
## Features
* 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

View File

@ -1,7 +1,7 @@
version: '2' version: '2'
services: services:
swarmkit-mon: swarmkit-mon:
image: rancher/swarmkit:v1.12.3-3 image: rancher/swarmkit:v1.13-1
environment: environment:
MANAGER_SCALE: ${MANAGER_SCALE} MANAGER_SCALE: ${MANAGER_SCALE}
labels: labels:
@ -9,7 +9,7 @@ services:
io.rancher.container.create_agent: 'true' io.rancher.container.create_agent: 'true'
io.rancher.container.dns: 'true' io.rancher.container.dns: 'true'
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
io.rancher.scheduler.affinity:host_label: io.rancher.host.docker_version=1.12 io.rancher.scheduler.affinity:host_label: io.rancher.host.docker_version=1.13
io.rancher.scheduler.global: 'true' io.rancher.scheduler.global: 'true'
network_mode: host network_mode: host
privileged: true privileged: true

View File

@ -1,5 +1,5 @@
.catalog: .catalog:
version: v1.12.3-3 version: v1.13-beta.1
minimum_rancher_version: 1.2.2 minimum_rancher_version: 1.2.2
questions: questions:
- variable: MANAGER_SCALE - variable: MANAGER_SCALE

View File

@ -1,5 +1,5 @@
name: SwarmKit name: SwarmKit
description: > description: >
A toolkit for orchestrating distributed systems at any scale A toolkit for orchestrating distributed systems at any scale
version: v1.12.3-3 version: v1.13-beta.1
category: Orchestration category: Orchestration