From 46eb6577224aaf41008100b8d344aae96b14ac89 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Tue, 10 Feb 2015 10:36:56 -0500
Subject: [PATCH] docker does not provision a docker group anymore, so do not
 add vagrant user to it

---
 cluster/saltbase/salt/kubelet/init.sls | 2 ++
 cluster/saltbase/salt/top.sls          | 4 ----
 cluster/saltbase/salt/vagrant.sls      | 7 -------
 cluster/vagrant/provision-minion.sh    | 1 -
 4 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 cluster/saltbase/salt/vagrant.sls

diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls
index 3e85b63bdef..37db7b896a6 100644
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ b/cluster/saltbase/salt/kubelet/init.sls
@@ -58,8 +58,10 @@ kubelet:
     - gid_from_name: True
     - shell: /sbin/nologin
     - home: /var/lib/kubelet
+{% if grains['os_family'] != 'RedHat' %}    
     - groups:
       - docker
+{% endif %}      
     - require:
       - group: kubelet
   service.running:
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 3a34d349072..ac88c982b17 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -45,7 +45,3 @@ base:
   'roles:kubernetes-pool-vsphere':
     - match: grain
     - static-routes
-
-  'roles:kubernetes-pool-vagrant':
-    - match: grain
-    - vagrant
diff --git a/cluster/saltbase/salt/vagrant.sls b/cluster/saltbase/salt/vagrant.sls
deleted file mode 100644
index 60b21f4f823..00000000000
--- a/cluster/saltbase/salt/vagrant.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-vagrant:
-  user.present:
-    - optional_groups:
-        - docker
-    - remove_groups: False
-    - require:
-      - pkg: docker-io
diff --git a/cluster/vagrant/provision-minion.sh b/cluster/vagrant/provision-minion.sh
index a15b783dbe5..bf865e629f5 100755
--- a/cluster/vagrant/provision-minion.sh
+++ b/cluster/vagrant/provision-minion.sh
@@ -55,7 +55,6 @@ grains:
   apiservers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
   roles:
     - kubernetes-pool
-    - kubernetes-pool-vagrant
   cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
   minion_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
 EOF