diff --git a/puppet/manifests/default.pp b/puppet/manifests/default.pp
index b09b74b..598dade 100644
--- a/puppet/manifests/default.pp
+++ b/puppet/manifests/default.pp
@@ -1,6 +1,7 @@
 node default {
   include base
   include user::stack
+  include user::vagrant
   include grenade
   include devstack
 }
diff --git a/puppet/modules/user/manifests/vagrant.pp b/puppet/modules/user/manifests/vagrant.pp
new file mode 100644
index 0000000..60c5993
--- /dev/null
+++ b/puppet/modules/user/manifests/vagrant.pp
@@ -0,0 +1,31 @@
+# == Class: user::vagrant
+#
+
+class user::vagrant(
+  $username = 'vagrant'
+)
+{
+  file {'/home/vagrant/.bashrc':
+    owner => $username,
+    group => $username,
+    mode => '0644',
+    source => 'puppet:///modules/user/stack_bashrc',
+  }
+
+  file {'/home/vagrant/devstack':
+    owner => $username,
+    group => $username,
+    mode => '0644',
+    ensure => 'link',
+    target => '/home/stack/devstack',
+  }
+
+  file {'/home/vagrant/grenade':
+    owner => $username,
+    group => $username,
+    mode => '0644',
+    ensure => 'link',
+    target => '/home/stack/grenade',
+  }
+
+}