diff options
| author | Martin André <m.andre@redhat.com> | 2016-02-09 11:15:01 +0900 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2016-02-09 11:23:24 +0900 |
| commit | 31e0b3454ce5b2aaea960ef778bc4432c22e002b (patch) | |
| tree | b2cc0204236df07f4d43130ad8e86e9aa8ead59e /dev | |
| parent | 815f040ee8c9000f6d6e66036d5f7379d3f1fcf2 (diff) | |
| download | kolla-31e0b3454ce5b2aaea960ef778bc4432c22e002b.tar.gz kolla-31e0b3454ce5b2aaea960ef778bc4432c22e002b.zip | |
Fix Vagrant provisioning with docker 1.10
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
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/vagrant/centos-bootstrap.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/vagrant/centos-bootstrap.sh b/dev/vagrant/centos-bootstrap.sh index 4589bd360..057362124 100644 --- a/dev/vagrant/centos-bootstrap.sh +++ b/dev/vagrant/centos-bootstrap.sh @@ -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 |