opendev/system-config
Code Issues Proposed changes

Add jenkins ssh private key to devstack-launch.

Browse Source 
It's needed to perform the test-logins to the new servers.

Change-Id: I8fd5cea8dd1b807b42acf508fcd4853bb735150e
Reviewed-on: https://review.openstack.org/24497
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Elizabeth Krumbach <lyz@princessleia.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-03-14 17:51:57 -07:00 committed by Jenkins
parent 0e90219dda
commit c7ec9dcc52
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/site.pp
View File

@ -234,8 +234,9 @@ node /^ci-backup-.*\.openstack\.org$/ {
node 'devstack-launch.slave.openstack.org' { node 'devstack-launch.slave.openstack.org' {
class { 'openstack_project::devstack_launch_slave': class { 'openstack_project::devstack_launch_slave':
jenkins_api_user => hiera('jenkins_api_user'), jenkins_api_user => hiera('jenkins_api_user'),
jenkins_api_key => hiera('jenkins_api_key') jenkins_api_key => hiera('jenkins_api_key'),
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents')
} }
} }

11
modules/openstack_project/manifests/devstack_launch_slave.pp
View File

@ -16,7 +16,8 @@
class openstack_project::devstack_launch_slave ( class openstack_project::devstack_launch_slave (
$jenkins_api_user, $jenkins_api_user,
$jenkins_api_key $jenkins_api_key,
$jenkins_ssh_private_key,
) { ) {
class { 'openstack_project::slave': class { 'openstack_project::slave':
@ -46,4 +47,12 @@ class openstack_project::devstack_launch_slave (
content => template('openstack_project/devstack-gate-secure.conf.erb'), content => template('openstack_project/devstack-gate-secure.conf.erb'),
require => File['/home/jenkins'], require => File['/home/jenkins'],
} }
file { '/home/jenkins/.ssh/id_rsa':
owner => 'jenkins',
group => 'jenkins',
mode => '0400',
require => File['/home/jenkins/.ssh'],
content => $jenkins_ssh_private_key,
}
} }