Merge pull request #4287 from derekwaynecarr/docker_group_gone

Docker 1.4.1 on Fedora no longer provisions a docker group

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:

cluster/saltbase/salt/top.sls

@@ -49,7 +49,3 @@ base:
   'roles:kubernetes-pool-vsphere':
     - match: grain
     - static-routes
-
-  'roles:kubernetes-pool-vagrant':
-    - match: grain
-    - vagrant

cluster/saltbase/salt/vagrant.sls

@@ -1,7 +0,0 @@
-vagrant:
-  user.present:
-    - optional_groups:
-        - docker
-    - remove_groups: False
-    - require:
-      - pkg: docker-io

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