diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-30 11:48:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-30 11:48:21 +0000 |
| commit | b397cd72e1d343b1d58b82ea3ff32f58bfcb6440 (patch) | |
| tree | 7549f25c0c9416850ccf45f2b8d46d8bf5f3dd47 | |
| parent | 43a3d8e93cf8a8411590a4719fd03b8702126da2 (diff) | |
| parent | 5b871d15a3cdca56aad70979800157c855ef87d0 (diff) | |
| download | kolla-b397cd72e1d343b1d58b82ea3ff32f58bfcb6440.tar.gz kolla-b397cd72e1d343b1d58b82ea3ff32f58bfcb6440.zip | |
Merge "Do not use AUFS for centos/fedora/oraclelinux container images on ubuntu host"
| -rw-r--r-- | doc/image-building.rst | 9 | ||||
| -rw-r--r-- | doc/quickstart.rst | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/image-building.rst b/doc/image-building.rst index 24714ab00..f96747ef3 100644 --- a/doc/image-building.rst +++ b/doc/image-building.rst @@ -188,11 +188,13 @@ image, the operator would add the following block to Known issues ============ -1. Can't build base image because docker fails to install systemd. +1. Can't build base image because docker fails to install systemd or httpd. There are some issues between docker and AUFS. The simple workaround to - avoid the issue is that add ``-s devicemapper`` to ``DOCKER_OPTS``. Get - more information about the issue from DockerBug_. + avoid the issue is that add ``-s devicemapper`` or ``-s btrfs`` to + ``DOCKER_OPTS``. Get more information about `the issue from the Docker bug + tracker <https://github.com/docker/docker/issues/6980>`_ and `how to + configure Docker with BTRFS backend <https://docs.docker.com/engine/userguide/storagedriver/btrfs-driver/#prerequisites>`_. 2. Mirrors are unreliable. @@ -298,5 +300,4 @@ variables that will be picked up from the user env:: Also these variables could be overwritten using ``--build-args``, which have precedence. -.. _DockerBug: https://github.com/docker/docker/issues/6980 .. _drivers: https://wiki.openstack.org/wiki/Neutron#Plugins diff --git a/doc/quickstart.rst b/doc/quickstart.rst index cbaf15289..ebdeedd96 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -117,6 +117,9 @@ For Ubuntu 14.04 which uses upstart instead of systemd, run the following: mount --make-shared /run +.. NOTE:: If centos/fedora/oraclelinux container images are built on an Ubuntu + host, the backend storage driver must not be AUFS (see the known issues in + :doc:`image-building`). On the target hosts you also need an updated version of the Docker python libraries: |