Merge pull request #1282 from derekwaynecarr/add_vagrant_to_docker_group

Add vagrant user to docker group
2014-09-15 17:07:02 -07:00 · 2014-09-15 17:07:02 -07:00 · c74060d465
parent 12cbe52fa7 63bd987561
commit c74060d465
3 changed files with 13 additions and 0 deletions
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@ -33,3 +33,8 @@ base:
  'roles:kubernetes-pool-vsphere':
    - match: grain
    - static-routes
+
+  'roles:kubernetes-pool-vagrant':
+    - match: grain
+    - vagrant
+
--- a/cluster/saltbase/salt/vagrant.sls
+++ b/cluster/saltbase/salt/vagrant.sls
@ -0,0 +1,7 @@
+vagrant:
+  user.present:
+    - optional_groups:
+        - docker
+    - remove_groups: False
+    - require:
+      - pkg: docker-io
--- a/cluster/vagrant/provision-minion.sh
+++ b/cluster/vagrant/provision-minion.sh
@ -49,6 +49,7 @@ grains:
  etcd_servers: $MASTER_IP
  roles:
    - kubernetes-pool
+    - kubernetes-pool-vagrant
  cbr-cidr: $MINION_IP_RANGE
  minion_ip: $MINION_IP
 EOF