From b41acf292f6f0eaf19679fb8dd37fca4bd339a09 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 16 Jul 2011 18:31:36 -0400
Subject: [PATCH] Refactored jenkins user def.
---
manifests/burrow.pp | 2 --
manifests/burrow_java.pp | 2 --
manifests/glance.pp | 2 --
manifests/libburrow.pp | 2 --
manifests/slave.pp | 2 --
modules/jenkins_slave/manifests/init.pp | 4 +++-
.../jenkins_slave/manifests/jenkinsuser.pp | 2 +-
7 files changed, 4 insertions(+), 12 deletions(-)
rename manifests/static_users.pp => modules/jenkins_slave/manifests/jenkinsuser.pp (99%)
diff --git a/manifests/burrow.pp b/manifests/burrow.pp
index b555e9fb6b..daca842c2b 100644
--- a/manifests/burrow.pp
+++ b/manifests/burrow.pp
@@ -1,10 +1,8 @@
import "openstack_ci_admins_users"
-import "static_users"
import "jenkins_slave"
node default {
include openstack_ci_admins_users
- include static_users
include jenkins_slave
package { "python-eventlet":
diff --git a/manifests/burrow_java.pp b/manifests/burrow_java.pp
index b35d307ba6..cb603c8b4b 100644
--- a/manifests/burrow_java.pp
+++ b/manifests/burrow_java.pp
@@ -1,10 +1,8 @@
import "openstack_ci_admins_users"
-import "static_users"
import "jenkins_slave"
node default {
include openstack_ci_admins_users
- include static_users
include jenkins_slave
package { "maven2":
diff --git a/manifests/glance.pp b/manifests/glance.pp
index 881a8c9767..fc45746ea3 100644
--- a/manifests/glance.pp
+++ b/manifests/glance.pp
@@ -1,10 +1,8 @@
import "openstack_ci_admins_users"
-import "static_users"
import "jenkins_slave"
node default {
include openstack_ci_admins_users
- include static_users
include jenkins_slave
package { "python-argparse":
diff --git a/manifests/libburrow.pp b/manifests/libburrow.pp
index 0b37296fd4..2811b5b791 100644
--- a/manifests/libburrow.pp
+++ b/manifests/libburrow.pp
@@ -1,10 +1,8 @@
import "openstack_ci_admins_users"
-import "static_users"
import "jenkins_slave"
node default {
include openstack_ci_admins_users
- include static_users
include jenkins_slave
package { "build-essential":
diff --git a/manifests/slave.pp b/manifests/slave.pp
index 5600bbc52c..7011a4f5af 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -1,9 +1,7 @@
import "openstack_ci_admins_users"
-import "static_users"
import "jenkins_slave"
node default {
include openstack_ci_admins_users
- include static_users
include jenkins_slave
}
diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index 9def0589fd..c40f98146c 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -1,8 +1,10 @@
class jenkins_slave {
+ jenkins_user { "jenkins" }
+
slavecirepo { "openstack-ci":
ensure => present,
- require => Package[git]
+ require => [ Package[git], Jenkinsuser[jenkins] ]
}
package { "python-software-properties":
diff --git a/manifests/static_users.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp
similarity index 99%
rename from manifests/static_users.pp
rename to modules/jenkins_slave/manifests/jenkinsuser.pp
index b7cb2287d6..8aad27c680 100644
--- a/manifests/static_users.pp
+++ b/modules/jenkins_slave/manifests/jenkinsuser.pp
@@ -1,4 +1,4 @@
-class static_users {
+class jenkinsuser {
group { 'jenkins':
ensure => 'present'