From dd6f50a4e78022b1f52341fa9f77b7576f0fbf88 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 14 Jun 2012 16:12:03 -0400
Subject: [PATCH] Install the slave scripts in the slave class.

Change-Id: I570fd29c8affad2b00b52003f1c1e8f8c1586dd4
---
 modules/jenkins_slave/manifests/init.pp       | 19 +++++++++++++++++++
 .../jenkins_slave/manifests/jenkinsuser.pp    | 18 ------------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index 02145855c0..77ecbf29b9 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -158,4 +158,23 @@ class jenkins_slave($ssh_key, $sudo = false, $bare = false, $user = true) {
           require => [File["/etc/mysql/my.cnf"], Package["mysql-server"]]
         }
     }
+
+    file { '/usr/local/jenkins':
+      owner => 'root',
+      group => 'root',
+      mode => 755,
+      ensure => 'directory',
+    }
+
+    file { '/usr/local/jenkins/slave_scripts':
+      owner => 'root',
+      group => 'root',
+      mode => 755,
+      ensure => 'directory',
+      recurse => true,
+      require => File['/usr/local/jenkins'],
+      source => [
+                  "puppet:///modules/jenkins_slave/slave_scripts",
+                ],
+    }
 }
diff --git a/modules/jenkins_slave/manifests/jenkinsuser.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp
index 6b03da22ba..54a4e77ca0 100644
--- a/modules/jenkins_slave/manifests/jenkinsuser.pp
+++ b/modules/jenkins_slave/manifests/jenkinsuser.pp
@@ -236,23 +236,5 @@ define jenkinsuser($ensure = present, $sudo = false, $ssh_key) {
   }
 
 
-  file { '/usr/local/jenkins':
-    owner => 'root',
-    group => 'root',
-    mode => 755,
-    ensure => 'directory',
-  }
-
-  file { '/usr/local/jenkins/slave_scripts':
-    owner => 'root',
-    group => 'root',
-    mode => 755,
-    ensure => 'directory',
-    recurse => true,
-    require => File['/usr/local/jenkins'],
-    source => [
-                "puppet:///modules/jenkins_slave/slave_scripts",
-              ],
-  }
 
 }