diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-09 14:47:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-09 14:47:12 +0000 |
| commit | 43bbaf760317574d3e02061d0b764a90b27a7587 (patch) | |
| tree | 663731c2336e15b58269d58a97cfcf6e112191c9 | |
| parent | f489768e89d8f31bfc6d351b57d031ea772ca289 (diff) | |
| parent | 31e0b3454ce5b2aaea960ef778bc4432c22e002b (diff) | |
| download | kolla-43bbaf760317574d3e02061d0b764a90b27a7587.tar.gz kolla-43bbaf760317574d3e02061d0b764a90b27a7587.zip | |
Merge "Fix Vagrant provisioning with docker 1.10"
| -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 |