Browse Source

Fix Rackspace cloud user, remove dupe /home/vagrant definition

Charles Hooper 12 years ago
parent
commit
5bec4b8f04
1 changed files with 12 additions and 6 deletions
  1. 12 6
      puppet/modules/docker/manifests/init.pp

+ 12 - 6
puppet/modules/docker/manifests/init.pp

@@ -52,6 +52,18 @@ class ec2 {
 }
 }
 
 
 class rax {
 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 {
 class docker {
@@ -112,12 +124,6 @@ class docker {
         require => Exec["copy-docker-bin"],
         require => Exec["copy-docker-bin"],
     }
     }
 
 
-    file { "/home/vagrant":
-        ensure => directory,
-        mode => 644,
-        require => User["vagrant"],
-    }
-
     file { "/home/vagrant/.profile":
     file { "/home/vagrant/.profile":
         mode => 644,
         mode => 644,
         owner => $vagrant_user,
         owner => $vagrant_user,