openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Vagrant provisioning with docker 1.10"

Browse Source
This commit is contained in:
Jenkins 2016-02-09 14:47:12 +00:00 committed by Gerrit Code Review
commit 43bbaf7603
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/vagrant/centos-bootstrap.sh
View File

@ -58,7 +58,8 @@ EOF
# Despite it shipping with /etc/sysconfig/docker, Docker is not configured to
# load it from it's service file.
sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker -d --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}," /usr/lib/systemd/system/docker.service
sed -i -r "s|(ExecStart)=(.+)|\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /usr/lib/systemd/system/docker.service
sed -i 's|^MountFlags=.*|MountFlags=shared|' /usr/lib/systemd/system/docker.service
systemctl daemon-reload
systemctl enable docker