Add ability to change the slave gerrit user

Some slaves may want to connect to gerrit as a different person.
Rather than hardcoding jenkins@openstack.org - parameterize it.

Change-Id: Iafeb76f1bec7a0ba1a33b0c9c5b74e2b88d13889
This commit is contained in:
Monty Taylor 2014-03-14 07:54:10 -07:00 committed by K Jonathan Harker
parent 0d19eef530
commit 70debfaeb1
4 changed files with 18 additions and 6 deletions

View File

@ -1,3 +0,0 @@
[user]
name = OpenStack Jenkins
email = jenkins@openstack.org

View File

@ -3,6 +3,9 @@
class jenkins::jenkinsuser(
$ssh_key = '',
$ensure = present,
$gitfullname = 'OpenStack Jenkins',
$gitemail = 'jenkins@openstack.org',
$gerrituser = 'jenkins',
) {
group { 'jenkins':
@ -40,7 +43,7 @@ class jenkins::jenkinsuser(
owner => 'jenkins',
group => 'jenkins',
mode => '0640',
source => 'puppet:///modules/jenkins/gitconfig',
content => template('jenkins/gitconfig.erb'),
require => File['/home/jenkins'],
}

View File

@ -4,6 +4,9 @@ class jenkins::slave(
$ssh_key = '',
$user = true,
$python3 = false,
$gitfullname = 'OpenStack Jenkins',
$gitemail = 'jenkins@openstack.org',
$gerrituser = 'jenkins',
) {
include pip
@ -11,8 +14,11 @@ class jenkins::slave(
if ($user == true) {
class { 'jenkins::jenkinsuser':
ensure => present,
ssh_key => $ssh_key,
ensure => present,
ssh_key => $ssh_key,
gitfullname => $gitfullname,
gitemail => $gitemail,
gerrituser => $gerrituser,
}
}

6
templates/gitconfig.erb Normal file
View File

@ -0,0 +1,6 @@
[user]
name = <%= scope.lookupvar('jenkins::jenkinsuser::gitfullname') %>
email = <%= scope.lookupvar('jenkins::jenkinsuser::gitemail') %>
[gitreview]
rebase = false
username = <%= scope.lookupvar('jenkins::jenkinsuser::gerrituser') %>