Fix documentation for Ubuntu and some rst formatting issues
I ran through the instructions on a Ubuntu 14.04 box and found a few things wrong. Also, if you look at the generated docs, the formatting is a bit off. Change-Id: Ie7090c4e2c63b508ea93d5504c371a5bfbf795e4
This commit is contained in:
parent
6ea1232f11
commit
aee146acdd
|
@ -23,8 +23,9 @@ targets, the kolla-kubernetes community recommends installing the official
|
|||
Docker, Inc. packaged version of Docker for maximum stability and compatibility.
|
||||
|
||||
.. NOTE:: Docker 1.11.0 is not compatible with Kubernetes due to some issues in
|
||||
Docker. The below command will install the latest docker and revert back to
|
||||
1.10.3.
|
||||
Docker. The below command will install the latest docker and revert back to
|
||||
1.10.3. For different Debian or Ubuntu distributions, you may need to use
|
||||
``apt-cache madison docker-engine`` to get the correct version.
|
||||
|
||||
::
|
||||
|
||||
|
@ -42,17 +43,25 @@ in 'thin' containers. Change MountFlags from slave to shared and restart
|
|||
Docker.
|
||||
|
||||
::
|
||||
|
||||
# Edit /usr/lib/system/systemd/docker.service
|
||||
MountFlags=shared
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl start docker
|
||||
|
||||
For Ubuntu 12.04/14.04 and other distributions that use upstart instead of
|
||||
systemd, run the following:
|
||||
|
||||
::
|
||||
|
||||
mount --make-shared /
|
||||
|
||||
HyperCube
|
||||
=========
|
||||
|
||||
HyperKube is series of containers that will run all the needed Kubernetes
|
||||
services locally.
|
||||
|
||||
If you prefer to run Kubernetes in containers follow the :doc:`kubernetes-all
|
||||
-in-one`.
|
||||
If you prefer to run Kubernetes in containers follow the :doc:`kubernetes-all-in-one`.
|
||||
|
||||
|
|
Loading…
Reference in New Issue