Merge "Set the gitpgpkey for signing nodes"

modules/openstack_project/manifests/signing_node.pp

@@ -21,6 +21,7 @@ class openstack_project::signing_node (
   $secring,
   $gitfullname = 'OpenStack Release Bot',
   $gitemail = 'infra-root@openstack.org',
+  $gitpgpkey = 'infra-root@openstack.org',
   $gerrituser = 'release',
   $gerritkey = undef,
   $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
@@ -31,6 +32,7 @@ class openstack_project::signing_node (
     ssh_key             => $jenkins_ssh_public_key,
     jenkins_gitfullname => $gitfullname,
     jenkins_gitemail    => $gitemail,
+    jenkins_gitpgpkey   => $gitpgpkey,
     jenkins_gerrituser  => $gerrituser,
     jenkins_gerritkey   => $gerritkey,
     project_config_repo => $project_config_repo,

modules/openstack_project/manifests/slave.pp

@@ -7,6 +7,7 @@ class openstack_project::slave (
   $sysadmins = [],
   $jenkins_gitfullname = 'OpenStack Jenkins',
   $jenkins_gitemail = 'jenkins@openstack.org',
+  $jenkins_gitpgpkey = 'jenkins@openstack.org',
   $jenkins_gerrituser = 'jenkins',
   $jenkins_gerritkey = undef,
   $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
@@ -28,6 +29,7 @@ class openstack_project::slave (
     ssh_key      => $ssh_key,
     gitfullname  => $jenkins_gitfullname,
     gitemail     => $jenkins_gitemail,
+    gitpgpkey    => $jenkins_gitpgpkey,
     gerrituser   => $jenkins_gerrituser,
     gerritkey    => $jenkins_gerritkey,
   }