opendev/system-config
Code Issues Proposed changes

Merge "Remove puppet-jenkins from single_use_slave.pp"

Browse Source
This commit is contained in:
Jenkins 2017-04-27 16:39:25 +00:00 committed by Gerrit Code Review
commit 85d7ad342c
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openstack_project/manifests/single_use_slave.pp
View File

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