From 3bcffb1656c9854ea767219584b20de19c8c5a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Tue, 9 Feb 2016 14:36:38 +0900
Subject: [PATCH] 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.

Change-Id: I1583849d5e45b5040af0cdc9b29ad364d421685f
Related-Bug: #1543201
---
 vagrant/provision.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vagrant/provision.sh b/vagrant/provision.sh
index f2b7e9a4..6b4fd734 100644
--- a/vagrant/provision.sh
+++ b/vagrant/provision.sh
@@ -47,9 +47,11 @@ EOF
     pip install docker-py
 
     # Configure registry
-    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
 
     # Start services
+    systemctl daemon-reload
     systemctl enable docker
     systemctl start docker
 }