Merge "Remove puppet-jenkins from single_use_slave.pp"

This commit is contained in:
Jenkins 2017-04-27 16:39:25 +00:00 committed by Gerrit Code Review
commit 85d7ad342c

View File

@ -7,6 +7,7 @@ class openstack_project::single_use_slave (
$certname = $::fqdn,
$install_resolv_conf = true,
$sudo = false,
# TODO(pabelanger): To be removed in a future patch.
$ssh_key = $openstack_project::jenkins_ssh_key,
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
@ -15,10 +16,4 @@ class openstack_project::single_use_slave (
certname => $certname,
install_resolv_conf => $install_resolv_conf,
}
class { '::jenkins::jenkinsuser':
ssh_key => $ssh_key,
gitfullname => $jenkins_gitfullname,
gitemail => $jenkins_gitemail,
}
}