Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept

Add comma-separated --auto-accept support.
Upstream-commit: 7da11b1afda5f42d07b7304a7edcd1886434d9ed
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-07-12 16:29:21 +02:00
committed by GitHub
3 changed files with 70 additions and 44 deletions
@@ -17,7 +17,7 @@ Usage: docker swarm init [OPTIONS]
Initialize a Swarm
Options:
--auto-accept value Auto acceptance policy (worker, manager or none)
--auto-accept value Auto acceptance policy (default worker)
--cert-expiry duration Validity period for node certificates (default 2160h0m0s)
--dispatcher-heartbeat duration Dispatcher heartbeat period (default 5s)
--external-ca value Specifications of one or more certificate signing endpoints
@@ -66,6 +66,13 @@ For example, the following initializes a cluster with auto-acceptance of workers
$ docker swarm init --listen-addr 192.168.99.121:2377 --auto-accept worker
```
It is possible to pass a comma-separated list of node types. The following initializes a cluster
with auto-acceptance of both `worker` and `manager` nodes
```bash
$ docker swarm init --listen-addr 192.168.99.121:2377 --auto-accept worker,manager
```
### `--cert-expiry`
This flag sets the validity period for node certificates.