openstack/kolla-ansible
Code Issues Proposed changes

Merge "updated insecure docker-registry configuration"

Browse Source
This commit is contained in:
Jenkins 2016-07-13 11:49:51 +00:00 committed by Gerrit Code Review
commit 27f1cad74f
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
doc/multinode.rst
View File

@ -36,39 +36,50 @@ registry is currently running:
:: ::
# CentOS # CentOS
other_args="--insecure-registry 192.168.1.100:4000" INSECURE_REGISTRY="--insecure-registry 192.168.1.100:4000"
For Ubuntu, edit ``/etc/default/docker`` and add: For Ubuntu, check whether its using upstart or systemd.
::
# stat /proc/1/exe
File: '/proc/1/exe' -> '/lib/systemd/systemd'
Edit ``/etc/default/docker`` and add:
:: ::
# Ubuntu # Ubuntu
DOCKER_OPTS="--insecure-registry 192.168.1.100:4000" DOCKER_OPTS="--insecure-registry 192.168.1.100:4000"
Docker Inc's packaged version of docker-engine for CentOS is defective and does If ubuntu is using systemd, additional settings needs to be configured.
not read the other_args configuration options from ``/etc/sysconfig/docker``. Copy docker's systemd unit file to ``/etc/systemd/system/`` directory:
To rectify this problem, ensure the following lines appear in the drop-in unit
file at ``/etc/systemd/system/docker.service.d/kolla.conf``:
:: ::
# CentOS # cp /lib/systemd/system/docker.service /etc/systemd/system/docker.service
Next, modify ``/etc/systemd/system/docker.service``, add ``environmentFile``
variable and add ``$DOCKER_OPTS`` to the end of ExecStart in ``[Service]``
section:
::
# Ubuntu
[Service] [Service]
EnvironmentFile=/etc/sysconfig/docker EnvironmentFile=-/etc/default/docker
# It's necessary to clear ExecStart before attempting to override it ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
# or systemd will complain that it is defined more than once.
ExecStart=/usr/bin/docker daemon -H fd:// $other_args
And restart docker by executing the following commands: Restart docker by executing the following commands:
:: ::
# CentOS # CentOS or Ubuntu with systemd
systemctl daemon-reload systemctl daemon-reload
systemctl stop docker systemctl stop docker
systemctl start docker systemctl start docker
# Ubuntu # Ubuntu with upstart or sysvinit
sudo service docker restart sudo service docker restart
Edit the Inventory File Edit the Inventory File