openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix pushing images to local registry documentation"

Browse Source
This commit is contained in:
Jenkins 2017-03-06 19:23:18 +00:00 committed by Gerrit Code Review
commit a118ca41a3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/multinode.rst
View File

@ -27,6 +27,22 @@ with version 2.3 or later, do the following:
tools/start-registry tools/start-registry
The Docker registry can be configured as a pull through cache to proxy the
official Kolla images hosted in Docker Hub. In order to configure the local
registry as a pull through cache, in the host machine set the environment
variable ``REGISTRY_PROXY_REMOTEURL`` to the URL for the repository on
Docker Hub.
::
export REGISTRY_PROXY_REMOTEURL=https://registry-1.docker.io
.. note::
Pushing to a registry configured as a pull-through cache is unsupported.
For more information, Reference the `Docker Documentation
<https://docs.docker.com/registry/configuration/>`__.
.. _configure_docker_all_nodes: .. _configure_docker_all_nodes:
Configure Docker on all nodes Configure Docker on all nodes
@ -35,10 +51,6 @@ Configure Docker on all nodes
.. note:: As the subtitle for this section implies, these steps should be .. note:: As the subtitle for this section implies, these steps should be
applied to all nodes, not just the deployment node. applied to all nodes, not just the deployment node.
The ``start-registry`` script configures a docker registry that proxies Kolla
images from Docker Hub, and can also be used with custom built images (see
`Building Container Images`_).
After starting the registry, it is necessary to instruct Docker that it will After starting the registry, it is necessary to instruct Docker that it will
be communicating with an insecure registry. To enable insecure registry be communicating with an insecure registry. To enable insecure registry
communication on CentOS, modify the ``/etc/sysconfig/docker`` file to contain communication on CentOS, modify the ``/etc/sysconfig/docker`` file to contain