Merge pull request #4287 from derekwaynecarr/docker_group_gone

Docker 1.4.1 on Fedora no longer provisions a docker group
2015-02-10 14:28:02 -08:00
parent c55921676c 46eb657722
commit 6b3bb763f0
4 changed files with 2 additions and 12 deletions
--- 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: