From 5bec4b8f040f366a5a1eed294d98e383d64b46e7 Mon Sep 17 00:00:00 2001
From: Charles Hooper <charles.hooper@dotcloud.com>
Date: Wed, 27 Mar 2013 01:41:06 +0000
Subject: [PATCH] Fix Rackspace cloud user, remove dupe /home/vagrant
 definition

---
 puppet/modules/docker/manifests/init.pp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/puppet/modules/docker/manifests/init.pp b/puppet/modules/docker/manifests/init.pp
index 8f8c04cd33..843cd021f1 100644
--- a/puppet/modules/docker/manifests/init.pp
+++ b/puppet/modules/docker/manifests/init.pp
@@ -52,6 +52,18 @@ class ec2 {
 }
 
 class rax {
+	user { "vagrant":
+		name => "ubuntu",
+		ensure => present,
+		comment => "Vagrant User",
+		shell => "/bin/bash",
+		home => "/home/ubuntu",
+	}
+	file { "/home/vagrant":
+		ensure => link,
+		target => "/home/ubuntu",
+		require => User["vagrant"],
+	}
 }
 
 class docker {
@@ -112,12 +124,6 @@ class docker {
         require => Exec["copy-docker-bin"],
     }
 
-    file { "/home/vagrant":
-        ensure => directory,
-        mode => 644,
-        require => User["vagrant"],
-    }
-
     file { "/home/vagrant/.profile":
         mode => 644,
         owner => $vagrant_user,