1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow swarm join with --availability=drain

Browse Source 
This fix tries to address the issue raised in 24596 where it was not
possible to join as manager only (`--availability=drain`).

This fix adds a new flag `--availability` to `swarm join`.

Related documentation has been updated.

An integration test has been added.

NOTE: Additional pull request for swarmkit and engine-api will
be created separately.

This fix fixes 24596.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-12-21 18:06:16 -08:00 committed by Tibor Vass
parent 8c3f18ca6d
commit f4d26add25
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/reference/commandline/swarm_join.md
View File

@ -22,6 +22,7 @@ Join a swarm as a node and/or manager
Options:
--advertise-addr string Advertised address (format: <ip|interface>[:port])
--availability string Availability of the node (active/pause/drain) (default "active")
--help Print usage
--listen-addr node-addr Listen address (format: <ip|interface>[:port]) (default 0.0.0.0:2377)
--token string Token for entry into the swarm
@ -94,6 +95,15 @@ This flag is generally not necessary when joining an existing swarm.
Secret value required for nodes to join the swarm
### `--availability`
This flag specifies the availability of the node at the time the node joins a master.
Possible availability values are `active`, `pause`, or `drain`.
This flag is useful in certain situations. For example, a cluster may want to have
dedicated manager nodes that are not served as worker nodes. This could be achieved
by passing `--availability=drain` to `docker swarm join`.
## Related information