From a916a7116d632e5838918c65ebd5daf0345cdd27 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Wed, 28 Mar 2012 20:42:04 +0100
Subject: [PATCH] Change jenkins_slave module deps

Don't depend on gpg key and other things to build the rest of the slave, just
depend on the directory used to build the thing

Change-Id: Ifb26ce2ca0bd3e284a173af9a1509ded1aab6941
---
 modules/jenkins_slave/manifests/init.pp        | 8 ++++----
 modules/jenkins_slave/manifests/jenkinsuser.pp | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index aadbae12d4..38c82a66cf 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -7,12 +7,12 @@ class jenkins_slave($ssh_key) {
 
     slavecirepo { "openstack-ci":
       ensure => present,
-      require => [ Package[git], Jenkinsuser[jenkins] ],
+      require => [ Package[git], File[jenkinshome] ],
     }
 
     devstackrepo { "devstack":
       ensure => present,
-      require => [ Package[git], Jenkinsuser[jenkins] ],
+      require => [ Package[git], File[jenkinshome] ],
     }
 
     apt::ppa { "ppa:openstack-ci/build-depends":
@@ -91,7 +91,7 @@ class jenkins_slave($ssh_key) {
       user => jenkins,
       minute => "*/15",
       command => "cd /home/jenkins/openstack-ci && /usr/bin/git pull -q origin master",
-      require => [ Jenkinsuser[jenkins] ],
+      require => [ File[jenkinshome] ],
     }
 
     file { 'profilerubygems':
@@ -110,7 +110,7 @@ class jenkins_slave($ssh_key) {
       minute => '0',
       hour   => '1',
       command => "/usr/sbin/tmpreaper --runtime 1200 --delay 600 1d /tmp 2>&1 | grep -v 'failed: Permission denied'",
-      require => [ Package[tmpreaper], Jenkinsuser[jenkins] ],
+      require => [ Package[tmpreaper], File[jenkinshome] ],
    }
 
    file { 'tmpreaper-cron.daily':
diff --git a/modules/jenkins_slave/manifests/jenkinsuser.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp
index 6004de9d86..37a103f56c 100644
--- a/modules/jenkins_slave/manifests/jenkinsuser.pp
+++ b/modules/jenkins_slave/manifests/jenkinsuser.pp
@@ -11,6 +11,7 @@ define jenkinsuser($ensure = present, $ssh_key) {
     gid => 'jenkins',
     shell => '/bin/bash',
     membership => 'minimum',
+    require => Group['jenkins']
   }
 
   file { 'jenkinshome':
@@ -19,6 +20,7 @@ define jenkinsuser($ensure = present, $ssh_key) {
     group => 'jenkins',
     mode => 644,
     ensure => 'directory',
+    require => User['jenkins']
   }