opendev/system-config
Code Issues Proposed changes

Merge "Add Jenkins SSH key to proposal.slave."

Browse Source
This commit is contained in:
Jenkins 2013-08-05 18:26:52 +00:00 committed by Gerrit Code Review
commit f6a8fc2ce8
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -430,9 +430,10 @@ node 'devstack-launch02.slave.openstack.org' {
node 'proposal.slave.openstack.org' { node 'proposal.slave.openstack.org' {
include openstack_project include openstack_project
class { 'openstack_project::proposal_slave': class { 'openstack_project::proposal_slave':
transifex_username => 'openstackjenkins', transifex_username => 'openstackjenkins',
transifex_password => hiera('transifex_password'), transifex_password => hiera('transifex_password'),
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
} }
} }

9
modules/openstack_project/manifests/proposal_slave.pp
View File

@ -5,6 +5,7 @@
# #
class openstack_project::proposal_slave ( class openstack_project::proposal_slave (
$jenkins_ssh_public_key, $jenkins_ssh_public_key,
$jenkins_ssh_private_key,
$transifex_password = '', $transifex_password = '',
$transifex_username = 'openstackci', $transifex_username = 'openstackci',
) { ) {
@ -27,4 +28,12 @@ class openstack_project::proposal_slave (
content => template('openstack_project/transifexrc.erb'), content => template('openstack_project/transifexrc.erb'),
require => User['jenkins'], require => User['jenkins'],
} }
file { '/home/jenkins/.ssh/id_rsa':
owner => 'jenkins',
group => 'jenkins',
mode => '0400',
require => File['/home/jenkins/.ssh'],
content => $jenkins_ssh_private_key,
}
} }