From 63bd9875612024d411022b3dee938f6716c122fb Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Thu, 11 Sep 2014 15:39:57 -0400
Subject: [PATCH] Add vagrant user to docker group

---
 cluster/saltbase/salt/top.sls       | 5 +++++
 cluster/saltbase/salt/vagrant.sls   | 7 +++++++
 cluster/vagrant/provision-minion.sh | 1 +
 3 files changed, 13 insertions(+)
 create mode 100644 cluster/saltbase/salt/vagrant.sls

diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 25ad16e7fdc..8a884e0555a 100644
--- 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
+
diff --git a/cluster/saltbase/salt/vagrant.sls b/cluster/saltbase/salt/vagrant.sls
new file mode 100644
index 00000000000..60b21f4f823
--- /dev/null
+++ b/cluster/saltbase/salt/vagrant.sls
@@ -0,0 +1,7 @@
+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 e7e859ee7c5..8236a055416 100755
--- 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