openstack
/
magnum
Code Issues Proposed changes

Update Swarm version to 1.2.5 

We should upgrade swarm because 1.0.0 is more than
one year old and lack features and bug fixes.

Change-Id: Ia236e473ce3152a6bf3115a3bfc62fbf0af100d7
Closes-Bug: 1644620
This commit is contained in:
Mathieu Velten 2016-11-24 19:23:52 +01:00
parent d3277af787
commit 472af7fd8e
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/dev/quickstart.rst
View File

@ -558,7 +558,7 @@ Now that we have a swarm cluster we can start interacting with it::
| updated_at | 2015-04-20T19:06:08+00:00 |
| create_timeout | 60 |
| api_address | https://172.24.4.4:6443 |
| coe_version | 1.0.0 |
| coe_version | 1.2.5 |
| cluster_template_id| e73298e7-e621-4d42-b35b-7a1952b97158 |
| master_addresses | ['172.24.4.6'] |
| node_count | 2 |

2
install-guide/source/launch-instance.rst
View File

@ -170,7 +170,7 @@ and one node. Then, using docker's native API you will create a container.
| updated_at | 2016-09-14T13:38:08+00:00 |
| discovery_url | https://discovery.etcd.io/a5ece414689287eca62e35555512bfd5 |
| api_address | tcp://172.24.4.10:2376 |
| coe_version | 1.0.0 |
| coe_version | 1.2.5 |
| master_addresses | ['172.24.4.10'] |
| create_timeout | 60 |
| node_addresses | ['172.24.4.8'] |

2
magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml
View File

@ -145,7 +145,7 @@ parameters:
swarm_version:
type: string
description: version of swarm used for swarm cluster
default: 1.0.0
default: 1.2.5
swarm_strategy:
type: string

5
releasenotes/notes/update-swarm-73d4340a881bff2f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- Update Swarm default version to 1.2.5.
It should be the last version since Docker people
are now working on the new Swarm mode integrated in Docker.