diff --git a/doc/source/dev/quickstart.rst b/doc/source/dev/quickstart.rst index 5e96e427f8..908e347d5f 100644 --- a/doc/source/dev/quickstart.rst +++ b/doc/source/dev/quickstart.rst @@ -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 | diff --git a/install-guide/source/launch-instance.rst b/install-guide/source/launch-instance.rst index 1381dc8ed6..ca20ef045a 100644 --- a/install-guide/source/launch-instance.rst +++ b/install-guide/source/launch-instance.rst @@ -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'] | diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml index b133955f83..ef535bfb99 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml @@ -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 diff --git a/releasenotes/notes/update-swarm-73d4340a881bff2f.yaml b/releasenotes/notes/update-swarm-73d4340a881bff2f.yaml new file mode 100644 index 0000000000..bec4ba4fdc --- /dev/null +++ b/releasenotes/notes/update-swarm-73d4340a881bff2f.yaml @@ -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.