Merge "Trivial doc fixes"

This commit is contained in:
Jenkins 2016-05-19 07:47:05 +00:00 committed by Gerrit Code Review
commit 731e99962e
2 changed files with 9 additions and 0 deletions

View File

@ -38,6 +38,7 @@ Installing Kuryr's libnetwork driver
Running the following will grab the requirements and install kuryr
::
$ sudo pip install .
@ -47,6 +48,7 @@ Configuring Kuryr
Edit keystone section in `/etc/kuryr/kuryr.conf`, replace ADMIN_PASSWORD:
::
auth_uri = http://127.0.0.1:35357/v2.0
admin_user = admin
admin_tenant_name = service
@ -57,6 +59,7 @@ In the same file uncomment the `bindir` parameter with the path for the Kuryr vi
executables:
::
bindir = /usr/local/libexec/kuryr
@ -73,6 +76,7 @@ you have installed `tox` before the execution of the below command.
After the booting, please restart your Docker service, e.g.,
::
$ sudo service docker restart
The bash script creates the following files if they are missing.

View File

@ -12,6 +12,7 @@ If you want to build your own container, you can just build it by running the
following command from this same directory:
::
docker build -t your_docker_username/libnetwork:latest .
How to get the container
@ -20,12 +21,14 @@ How to get the container
To get the upstream docker libnetwork container with ovs, you can just do:
::
docker pull kuryr/libnetwork:latest
It is expected that different vendors may have their own versions of the
Kuryr libnetwork container in their docker hub namespaces, for example:
::
docker pull midonet/libnetwork:latest
The reason for this is that some vendors' binding scripts need different (and
@ -37,6 +40,7 @@ How to run the container
First we prepare Docker to find the driver
::
sudo mkdir -p /usr/lib/docker/plugins/kuryr
sudo curl -o /usr/lib/docker/plugins/kuryr/kuryr.spec \
https://raw.githubusercontent.com/openstack/kuryr/master/etc/kuryr.spec
@ -45,6 +49,7 @@ First we prepare Docker to find the driver
Then we start the container
::
docker run --name kuryr-libnetwork \
--net=host \
--cap-add=NET_ADMIN \