opendev/system-config
Code Issues Proposed changes

Refactored jenkins user def.

Browse Source
This commit is contained in:
Monty Taylor 2011-07-16 18:31:36 -04:00
parent 048f615a32
commit b41acf292f
7 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/burrow.pp
View File

@ -1,10 +1,8 @@
import "openstack_ci_admins_users" import "openstack_ci_admins_users"
import "static_users"
import "jenkins_slave" import "jenkins_slave"
node default { node default {
include openstack_ci_admins_users include openstack_ci_admins_users
include static_users
include jenkins_slave include jenkins_slave
package { "python-eventlet": package { "python-eventlet":

2
manifests/burrow_java.pp
View File

@ -1,10 +1,8 @@
import "openstack_ci_admins_users" import "openstack_ci_admins_users"
import "static_users"
import "jenkins_slave" import "jenkins_slave"
node default { node default {
include openstack_ci_admins_users include openstack_ci_admins_users
include static_users
include jenkins_slave include jenkins_slave
package { "maven2": package { "maven2":

2
manifests/glance.pp
View File

@ -1,10 +1,8 @@
import "openstack_ci_admins_users" import "openstack_ci_admins_users"
import "static_users"
import "jenkins_slave" import "jenkins_slave"
node default { node default {
include openstack_ci_admins_users include openstack_ci_admins_users
include static_users
include jenkins_slave include jenkins_slave
package { "python-argparse": package { "python-argparse":

2
manifests/libburrow.pp
View File

@ -1,10 +1,8 @@
import "openstack_ci_admins_users" import "openstack_ci_admins_users"
import "static_users"
import "jenkins_slave" import "jenkins_slave"
node default { node default {
include openstack_ci_admins_users include openstack_ci_admins_users
include static_users
include jenkins_slave include jenkins_slave
package { "build-essential": package { "build-essential":

2
manifests/slave.pp
View File

@ -1,9 +1,7 @@
import "openstack_ci_admins_users" import "openstack_ci_admins_users"
import "static_users"
import "jenkins_slave" import "jenkins_slave"
node default { node default {
include openstack_ci_admins_users include openstack_ci_admins_users
include static_users
include jenkins_slave include jenkins_slave
} }

4
modules/jenkins_slave/manifests/init.pp
View File

@ -1,8 +1,10 @@
class jenkins_slave { class jenkins_slave {
jenkins_user { "jenkins" }
slavecirepo { "openstack-ci": slavecirepo { "openstack-ci":
ensure => present, ensure => present,
require => Package[git] require => [ Package[git], Jenkinsuser[jenkins] ]
} }
package { "python-software-properties": package { "python-software-properties":

2
manifests/static_users.pp → modules/jenkins_slave/manifests/jenkinsuser.pp
View File

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