diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-13 11:49:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-13 11:49:52 +0000 |
| commit | 27f1cad74f84e4ac32267328b7bd3d5edb6bc6f5 (patch) | |
| tree | 2395faf6fd71b9a39ff9966c9a6d3eba9f8e99f1 | |
| parent | a354be493ed0fb4b68e4b36cf51c2f1e49d29298 (diff) | |
| parent | 39875a5c9f86e9155f489ac96e8891f40140d95b (diff) | |
| download | kolla-27f1cad74f84e4ac32267328b7bd3d5edb6bc6f5.tar.gz kolla-27f1cad74f84e4ac32267328b7bd3d5edb6bc6f5.zip | |
Merge "updated insecure docker-registry configuration"
| -rw-r--r-- | doc/multinode.rst | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/doc/multinode.rst b/doc/multinode.rst index 5a51380fe..80f52e00a 100644 --- a/doc/multinode.rst +++ b/doc/multinode.rst @@ -36,39 +36,50 @@ registry is currently running: :: # 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 DOCKER_OPTS="--insecure-registry 192.168.1.100:4000" -Docker Inc's packaged version of docker-engine for CentOS is defective and does -not read the other_args configuration options from ``/etc/sysconfig/docker``. -To rectify this problem, ensure the following lines appear in the drop-in unit -file at ``/etc/systemd/system/docker.service.d/kolla.conf``: +If ubuntu is using systemd, additional settings needs to be configured. +Copy docker's systemd unit file to ``/etc/systemd/system/`` directory: :: - # 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] - EnvironmentFile=/etc/sysconfig/docker - # It's necessary to clear ExecStart before attempting to override it - # or systemd will complain that it is defined more than once. - ExecStart=/usr/bin/docker daemon -H fd:// $other_args + EnvironmentFile=-/etc/default/docker + ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS -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 stop docker systemctl start docker - # Ubuntu + # Ubuntu with upstart or sysvinit sudo service docker restart Edit the Inventory File |