From a70bec28fd38c153fd27f68f016696283f0395e7 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 14 Mar 2014 07:54:10 -0700
Subject: [PATCH] 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
---
 modules/jenkins/files/gitconfig          |  3 ---
 modules/jenkins/manifests/jenkinsuser.pp |  5 ++++-
 modules/jenkins/manifests/slave.pp       | 10 ++++++++--
 modules/jenkins/templates/gitconfig.erb  |  6 ++++++
 4 files changed, 18 insertions(+), 6 deletions(-)
 delete mode 100644 modules/jenkins/files/gitconfig
 create mode 100644 modules/jenkins/templates/gitconfig.erb

diff --git a/modules/jenkins/files/gitconfig b/modules/jenkins/files/gitconfig
deleted file mode 100644
index a6f99e8aee..0000000000
--- a/modules/jenkins/files/gitconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-	name = OpenStack Jenkins
-	email = jenkins@openstack.org
diff --git a/modules/jenkins/manifests/jenkinsuser.pp b/modules/jenkins/manifests/jenkinsuser.pp
index b4f1f12894..0953ae54a4 100644
--- a/modules/jenkins/manifests/jenkinsuser.pp
+++ b/modules/jenkins/manifests/jenkinsuser.pp
@@ -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'],
   }
 
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 3400c9fd27..b958d81c33 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -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,
     }
   }
 
diff --git a/modules/jenkins/templates/gitconfig.erb b/modules/jenkins/templates/gitconfig.erb
new file mode 100644
index 0000000000..fa7efca93a
--- /dev/null
+++ b/modules/jenkins/templates/gitconfig.erb
@@ -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') %>