openstack/kolla-ansible
Code Issues Proposed changes

Fix Vagrant provisioning with docker 1.10

Browse Source 
docker 1.10 removed the -d flag in favor of "daemon". Also adjust
docker config to enable shared mount namespace.

Closes-Bug: #1543201

Change-Id: I14cb497e0e02d90cdf74de8a09cca346f68254ab
This commit is contained in:
Martin André 2016-02-09 11:15:01 +09:00
parent 815f040ee8
commit 31e0b3454c
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