Refactored jenkins user def.

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":

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":

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":

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":

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
 }

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":

modules/jenkins_slave/manifests/jenkinsuser.pp

@@ -1,4 +1,4 @@
-class static_users {
+class jenkinsuser {
 
   group { 'jenkins':
     ensure => 'present'