1. docker
  2. Commit 3f276b58a55adadd4b80dbcb3bd6042fb608c247
Browse code

update docker swarm cli

Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 78ebfaff1a426425573c440c24eb0f36ffed4d8c)

Charles Smith authored on 2016/06/18 05:30:17
Showing 4 changed files
docs/reference/commandline/swarm_init.md
History View file @ 3f276b5
... ... 
@@ -29,17 +29,17 @@ in the newly created one node Swarm cluster.
29 29
30 30 
 ```bash
31 31 
 $ docker swarm init --listen-addr 192.168.99.121:2377
32 
-Initializing a new swarm
32 
+Swarm initialized: current node (1ujecd0j9n3ro9i6628smdmth) is now a manager.
33 33 
 $ docker node ls
34 
-ID              NAME          STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
35 
-3l1f6uzcuoa3 *  swarm-master  READY   ACTIVE                   REACHABLE       Yes
34 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS          LEADER
35 
+1ujecd0j9n3ro9i6628smdmth *  manager1  Accepted    Ready   Active        Reachable               Yes
36 36 
 ```
37 37
38 38 
 ###	--auto-accept value
39 39
40 40 
 This flag controls node acceptance into the cluster. By default, both `worker` and `manager`
41 41 
 nodes are auto accepted by the cluster. This can be changed by specifing what kinds of nodes
42 
-can be auto-accepted into the cluster. If auto-accept is not turned on, then
42 
+can be auto-accepted into the cluster. If auto-accept is not turned on, then
43 43 
 [node accept](node_accept.md) can be used to explicitly accept a node into the cluster.
44 44
45 45 
 For example, the following initializes a cluster with auto-acceptance of workers, but not managers
... ... 
@@ -47,7 +47,7 @@ For example, the following initializes a cluster with auto-acceptance of workers
47 47
48 48 
 ```bash
49 49 
 $ docker swarm init --listen-addr 192.168.99.121:2377 --auto-accept worker
50 
-Initializing a new swarm
50 
+Swarm initialized: current node (1m8cdsylxbf3lk8qriqt07hx1) is now a manager.
51 51 
 ```
52 52
53 53 
 ### `--force-new-cluster`
docs/reference/commandline/swarm_join.md
History View file @ 3f276b5
... ... 
@@ -29,23 +29,23 @@ targeted by this command becomes a `manager`. If it is not specified, it becomes
29 29
30 30 
 ```bash
31 31 
 $ docker swarm join --manager --listen-addr 192.168.99.122:2377 192.168.99.121:2377
32 
-This node is attempting to join a Swarm as a manager.
32 
+This node joined a Swarm as a manager.
33 33 
 $ docker node ls
34 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
35 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
36 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
34 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
35 
+dkp8vy1dq1kxleu9g4u78tlag *  manager2  Accepted    Ready   Active        Reachable
36 
+dvfxp4zseq4s0rih1selh0d20    manager1  Accepted    Ready   Active        Reachable              Yes
37 37 
 ```
38 38
39 39 
 ### Join a node to swarm as a worker
40 40
41 41 
 ```bash
42 42 
 $ docker swarm join --listen-addr 192.168.99.123:2377 192.168.99.121:2377
43 
-This node is attempting to join a Swarm.
43 
+This node joined a Swarm as a worker.
44 44 
 $ docker node ls
45 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
46 
-04zm7ue1fd1q    swarm-node-02  READY   ACTIVE
47 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
48 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
45 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
46 
+7ln70fl22uw2dvjn2ft53m3q5    worker2   Accepted    Ready   Active
47 
+dkp8vy1dq1kxleu9g4u78tlag    worker1   Accepted    Ready   Active        Reachable
48 
+dvfxp4zseq4s0rih1selh0d20 *  manager1  Accepted    Ready   Active        Reachable              Yes
49 49 
 ```
50 50
51 51 
 ### `--manager`
docs/reference/commandline/swarm_leave.md
History View file @ 3f276b5
... ... 
@@ -24,10 +24,10 @@ This command causes the node to leave the swarm.
24 24 
 On a manager node:
25 25 
 ```bash
26 26 
 $ docker node ls
27 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
28 
-04zm7ue1fd1q    swarm-node-02  READY   ACTIVE
29 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
30 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
27 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
28 
+7ln70fl22uw2dvjn2ft53m3q5    worker2   Accepted    Ready   Active
29 
+dkp8vy1dq1kxleu9g4u78tlag    worker1   Accepted    Ready   Active        Reachable
30 
+dvfxp4zseq4s0rih1selh0d20 *  manager1  Accepted    Ready   Active        Reachable              Yes
31 31 
 ```
32 32
33 33 
 On a worker node:
... ... 
@@ -39,10 +39,10 @@ Node left the default swarm.
39 39 
 On a manager node:
40 40 
 ```bash
41 41 
 $ docker node ls
42 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
43 
-04zm7ue1fd1q    swarm-node-02  DOWN    ACTIVE
44 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
45 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
42 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
43 
+7ln70fl22uw2dvjn2ft53m3q5    worker2   Accepted    Down    Active
44 
+dkp8vy1dq1kxleu9g4u78tlag    worker1   Accepted    Ready   Active        Reachable
45 
+dvfxp4zseq4s0rih1selh0d20 *  manager1  Accepted    Ready   Active        Reachable              Yes
46 46 
 ```
47 47
48 48 
 ## Related information
docs/reference/commandline/swarm_update.md
History View file @ 3f276b5
... ... 
@@ -13,16 +13,15 @@ parent = "smn_cli"
13 13 
 # swarm update
14 14
15 15 
     Usage:  docker swarm update [OPTIONS]
16 
-
16 
+
17 17 
     update the Swarm.
18 
-
18 
+
19 19 
     Options:
20 20 
           --auto-accept value               Auto acceptance policy (worker, manager or none)
21 21 
           --dispatcher-heartbeat duration   Dispatcher heartbeat period (default 5s)
22 22 
           --help                            Print usage
23 23 
           --secret string                   Set secret value needed to accept nodes into cluster
24 24 
           --task-history-limit int          Task history retention limit (default 10)
25 
-          --cert-expiry duration            Validity period for node certificates (default 2160h0m0s)
26 25
27 26 
 Updates a Swarm cluster with new parameter values. This command must target a manager node.
28 27
... ... 
@@ -36,4 +35,3 @@ $ docker swarm update --auto-accept manager
36 36 
 * [swarm init](swarm_init.md)
37 37 
 * [swarm join](swarm_join.md)
38 38 
 * [swarm leave](swarm_leave.md)
39 
-