diff --git a/manifests/jenkinsuser.pp b/manifests/jenkinsuser.pp index 62f4935..56eb174 100644 --- a/manifests/jenkinsuser.pp +++ b/manifests/jenkinsuser.pp @@ -5,6 +5,7 @@ class jenkins::jenkinsuser( $ensure = present, $gitfullname = 'OpenStack Jenkins', $gitemail = 'jenkins@openstack.org', + $gitpgpkey = 'jenkins@openstack.org', $gerrituser = 'jenkins', $gerritkeytype = 'rsa', $gerritkey = undef, diff --git a/manifests/slave.pp b/manifests/slave.pp index 5803488..a23ade7 100644 --- a/manifests/slave.pp +++ b/manifests/slave.pp @@ -5,6 +5,7 @@ class jenkins::slave( $user = true, $gitfullname = 'OpenStack Jenkins', $gitemail = 'jenkins@openstack.org', + $gitpgpkey = 'jenkins@openstack.org', $gerrituser = 'jenkins', $gerritkeytype = 'rsa', $gerritkey = undef, @@ -20,6 +21,7 @@ class jenkins::slave( ssh_key => $ssh_key, gitfullname => $gitfullname, gitemail => $gitemail, + gitpgpkey => $gitpgpkey, gerrituser => $gerrituser, gerritkeytype => $gerritkeytype, gerritkey => $gerritkey, diff --git a/templates/gitconfig.erb b/templates/gitconfig.erb index fa7efca..8b89a9f 100644 --- a/templates/gitconfig.erb +++ b/templates/gitconfig.erb @@ -1,6 +1,7 @@ [user] name = <%= scope.lookupvar('jenkins::jenkinsuser::gitfullname') %> email = <%= scope.lookupvar('jenkins::jenkinsuser::gitemail') %> + signingkey = <%= scope.lookupvar('jenkins::jenkinsuser::gitpgpkey') %> [gitreview] rebase = false username = <%= scope.lookupvar('jenkins::jenkinsuser::gerrituser') %>