Browse code

Fixing ZooKeeper and some other nits Nathan found

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b)

Mary Anthony authored on 2015/11/03 22:34:54
Showing 4 changed files
... ...
@@ -43,7 +43,7 @@ Engine, you must create an `overlay` network. Unlike `bridge` networks overlay
43 43
 networks require some pre-existing conditions before you can create one. These
44 44
 conditions are:
45 45
 
46
-* Access to a key-value store. Engine supports Consul, Etcd, and Zookeeper (Distributed store) key-value stores.
46
+* Access to a key-value store. Engine supports Consul, Etcd, and ZooKeeper (Distributed store) key-value stores.
47 47
 * A cluster of hosts with connectivity to the key-value store.
48 48
 * A properly configured Engine `daemon` on each host in the cluster.
49 49
 
... ...
@@ -392,7 +392,7 @@ out-of-the-box. This support is accomplished with the help of `libnetwork`, a
392 392
 built-in VXLAN-based overlay network driver, and Docker's `libkv` library.
393 393
 
394 394
 The `overlay` network requires a valid key-value store service. Currently,
395
-Docker's supports Consul, Etcd, and Zookeeper (Distributed store). Before
395
+Docker's supports Consul, Etcd, and ZooKeeper (Distributed store). Before
396 396
 creating a network you must install and configure your chosen key-value store
397 397
 service. The Docker hosts that you intend to network and the service must be
398 398
 able to communicate.
... ...
@@ -17,7 +17,7 @@ network. Docker Engine supports multi-host-networking out-of-the-box through the
17 17
 some pre-existing conditions before you can create one. These conditions are:
18 18
 
19 19
 * A host with a 3.16 kernel version or higher.
20
-* Access to a key-value store. Docker supports Consul, Etcd, and Zookeeper (Distributed store) key-value stores.
20
+* Access to a key-value store. Docker supports Consul, Etcd, and ZooKeeper (Distributed store) key-value stores.
21 21
 * A cluster of hosts with connectivity to the key-value store.
22 22
 * A properly configured Engine `daemon` on each host in the cluster.
23 23
 
... ...
@@ -39,14 +39,14 @@ Machine to the latest versions.
39 39
 
40 40
 An overlay network requires a key-value store. The key-value stores information
41 41
 about the network state which includes discovery, networks, endpoints,
42
-ip-addresses, and more. Docker supports Consul, Etcd, and Zookeeper (Distributed
42
+ip-addresses, and more. Docker supports Consul, Etcd, and ZooKeeper (Distributed
43 43
 store) key-value stores. This example uses Consul.
44 44
 
45 45
 1. Log into a system prepared with the prerequisite Docker Engine, Docker Machine, and VirtualBox software.
46 46
 
47 47
 2. Provision a VirtualBox machine called `mh-keystore`.  
48 48
 
49
-				$ docker-machine create -d VirtualBox mh-keystore
49
+				$ docker-machine create -d virtualbox mh-keystore
50 50
 
51 51
 	When you provision a new machine, the process adds Docker Engine to the
52 52
 	host. This means rather than installing Consul manually, you can create an
... ...
@@ -88,10 +88,10 @@ that machine options that are needed by the `overlay` network driver.
88 88
 1. Create a Swarm master.
89 89
 
90 90
 			$ docker-machine create \
91
-			-d VirtualBox \
91
+			-d virtualbox \
92 92
 			--swarm --swarm-image="swarm" --swarm-master \
93 93
 			--swarm-discovery="consul://$(docker-machine ip mh-keystore):8500" \
94
-			--engine-opt="cluster-store=consul://$(docker-machine ip mh-keystore):8500"
94
+			--engine-opt="cluster-store=consul://$(docker-machine ip mh-keystore):8500" \
95 95
 			--engine-opt="cluster-advertise=eth1:2376" \
96 96
 			mhs-demo0
97 97
 
... ...
@@ -99,7 +99,7 @@ that machine options that are needed by the `overlay` network driver.
99 99
 
100 100
 2. Create another host and add it to the Swarm cluster.
101 101
 
102
-		$ docker-machine create -d VirtualBox \
102
+		$ docker-machine create -d virtualbox \
103 103
 			--swarm --swarm-image="swarm:1.0.0-rc2" \
104 104
 			--swarm-discovery="consul://$(docker-machine ip mh-keystore):8500" \
105 105
 			--engine-opt="cluster-store=consul://$(docker-machine ip mh-keystore):8500" \
... ...
@@ -110,10 +110,10 @@ that machine options that are needed by the `overlay` network driver.
110 110
 
111 111
 		$ docker-machine ls
112 112
 		NAME         ACTIVE   DRIVER       STATE     URL                         SWARM
113
-		default               VirtualBox   Running   tcp://192.168.99.100:2376   
114
-		mh-keystore            VirtualBox   Running   tcp://192.168.99.103:2376   
115
-		mhs-demo0             VirtualBox   Running   tcp://192.168.99.104:2376   mhs-demo0 (master)
116
-		mhs-demo1             VirtualBox   Running   tcp://192.168.99.105:2376   mhs-demo0
113
+		default               virtualbox   Running   tcp://192.168.99.100:2376   
114
+		mh-keystore           virtualbox   Running   tcp://192.168.99.103:2376   
115
+		mhs-demo0             virtualbox   Running   tcp://192.168.99.104:2376   mhs-demo0 (master)
116
+		mhs-demo1             virtualbox   Running   tcp://192.168.99.105:2376   mhs-demo0
117 117
 
118 118
 At this point you have a set of hosts running on your network. You are ready to create a multi-host network for containers using these hosts.
119 119
 
... ...
@@ -126,7 +126,7 @@ To create an overlay network
126 126
 
127 127
 1. Set your docker environment to the Swarm master.
128 128
 
129
-			$ eval $(docker-machine --swarm env mhs-demo0)
129
+			$ eval $(docker-machine env --swarm mhs-demo0)
130 130
 
131 131
 		Using the `--swarm` flag with `docker-machine` restricts the `docker` commands to Swarm information alone.
132 132
 
... ...
@@ -143,12 +143,12 @@ To create an overlay network
143 143
 			└ Containers: 2
144 144
 			└ Reserved CPUs: 0 / 1
145 145
 			└ Reserved Memory: 0 B / 1.021 GiB
146
-			└ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0-rc1 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=VirtualBox, storagedriver=aufs
146
+			└ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0-rc1 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=virtualbox, storagedriver=aufs
147 147
 			mhs-demo1: 192.168.99.105:2376
148 148
 			└ Containers: 1
149 149
 			└ Reserved CPUs: 0 / 1
150 150
 			└ Reserved Memory: 0 B / 1.021 GiB
151
-			└ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0-rc1 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=VirtualBox, storagedriver=aufs
151
+			└ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0-rc1 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=virtualbox, storagedriver=aufs
152 152
 			CPUs: 2
153 153
 			Total Memory: 2.043 GiB
154 154
 			Name: 30438ece0915
... ...
@@ -59,7 +59,7 @@ $ docker network inspect simple-network
59 59
 Unlike `bridge` networks, `overlay` networks require some pre-existing conditions
60 60
 before you can create one. These conditions are:
61 61
 
62
-* Access to a key-value store. Engine supports Consul Etcd, and Zookeeper (Distributed store) key-value stores.
62
+* Access to a key-value store. Engine supports Consul Etcd, and ZooKeeper (Distributed store) key-value stores.
63 63
 * A cluster of hosts with connectivity to the key-value store.
64 64
 * A properly configured Engine `daemon` on each host in the swarm.
65 65