From d281be376454aba8a6105029f25499c41d92f7a2 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Tue, 10 Feb 2015 11:56:29 +0100
Subject: [PATCH] Make sure vagrant development environment works well with new
 docker-io

* Do not add vagrant to the docker group since it is not created
  automatically
* Make sure the docker service will start with the openshift services

Fixes #960
---
 vagrant/provision-master.sh | 2 +-
 vagrant/provision-minion.sh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vagrant/provision-master.sh b/vagrant/provision-master.sh
index 2f5acf3a3239..456db10a185b 100755
--- a/vagrant/provision-master.sh
+++ b/vagrant/provision-master.sh
@@ -33,12 +33,12 @@ popd
 # Start docker
 systemctl enable docker.service
 systemctl start docker.service
-usermod -a -G docker vagrant
 
 # Create systemd service
 cat <<EOF > /usr/lib/systemd/system/openshift-master.service
 [Unit]
 Description=openshift master
+Requires=docker.service
 After=network.service
 
 [Service]
diff --git a/vagrant/provision-minion.sh b/vagrant/provision-minion.sh
index 6ce0e02adb57..2affb80eefa5 100755
--- a/vagrant/provision-minion.sh
+++ b/vagrant/provision-minion.sh
@@ -39,8 +39,6 @@ else
   $(dirname $0)/provision-gre-network.sh $@
 fi
 
-usermod -a -G docker vagrant
-
 # Copy over the certificates directory and modify the kubeconfig file to use the master ip
 cp -r /vagrant/openshift.local.certificates /
 chown -R vagrant.vagrant /openshift.local.certificates
@@ -50,6 +48,7 @@ sed -ie "s/10.0.2.15/${MASTER_IP}/g" /openshift.local.certificates/admin/.kubeco
 cat <<EOF > /usr/lib/systemd/system/openshift-node.service
 [Unit]
 Description=openshift node
+Requires=docker.service
 After=network.service
 
 [Service]