Skip to content

Commit 976b00c

Browse files
committed
Fixes to docs
1 parent 02d07fc commit 976b00c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ In the examples directory [two_hosts_multiple_tenants.json](examples/two_hosts_m
113113
(disjoint, overlapping) networks within a cluster.
114114

115115
####Trying the multi-host tests on a single machine using docker as hosts
116-
If you cannot launch VM on your host one can also test the multi-host network by simulating hosts using docker containers. Please see [docs/Dockerhost.md](docs/Dockerhost.md) for instructions.
116+
If you cannot launch VM on your host, especially if your host is itself a VM, one can test the multi-host network by simulating hosts using docker containers. Please see [docs/Dockerhost.md](docs/Dockerhost.md) for instructions.
117117

118118
####Auto-allocation of IP addresses
119119
The plugin can automatically manage the IP address pools and assign an appropriate IP address based on the subnet that was associated with the network. However this doesn't take away the flexibility to keep a specific IP address of a container, which can always be specified as shown earlier. To automatically allocate the IP address, just avoid specifying the IP address during endpoint creation or endpoint description

docs/Dockerhost.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The multi node container networking can now be tested on a single VM by running docker inside docker.
1+
The multi node container networking can be tested on a single VM by running docker inside docker.
22
https://blog.docker.com/2013/09/docker-can-now-run-within-docker/
33

44
The outside docker containers act like physical hosts in our test and are connected using a standard linux bridge. Inside each "host container" we run a namespaced instance of docker, OVS , etcd and netplugin instance. One can now launch containers from within each "host containers" and use netplugin networking to connect them.
@@ -7,8 +7,11 @@ Prerequisites
77
-------------
88
The following needs to be installed on the host machine
99
1. Docker
10-
2. nsenter
11-
3. Linux bridge
10+
2. nsenter (Pls see https://github.com/jpetazzo/nsenter)
11+
3. Bridge utils
12+
```
13+
apt-get install bridge-utils
14+
````
1215
1316
Step to launch docker hosts are :
1417
--------------------------------

0 commit comments

Comments
 (0)