Add jenkins ssh private key to devstack-launch.
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:
parent
0e90219dda
commit
c7ec9dcc52
@ -234,8 +234,9 @@ node /^ci-backup-.*\.openstack\.org$/ {
|
||||
|
||||
node 'devstack-launch.slave.openstack.org' {
|
||||
class { 'openstack_project::devstack_launch_slave':
|
||||
jenkins_api_user => hiera('jenkins_api_user'),
|
||||
jenkins_api_key => hiera('jenkins_api_key')
|
||||
jenkins_api_user => hiera('jenkins_api_user'),
|
||||
jenkins_api_key => hiera('jenkins_api_key'),
|
||||
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents')
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,8 @@
|
||||
|
||||
class openstack_project::devstack_launch_slave (
|
||||
$jenkins_api_user,
|
||||
$jenkins_api_key
|
||||
$jenkins_api_key,
|
||||
$jenkins_ssh_private_key,
|
||||
) {
|
||||
|
||||
class { 'openstack_project::slave':
|
||||
@ -46,4 +47,12 @@ class openstack_project::devstack_launch_slave (
|
||||
content => template('openstack_project/devstack-gate-secure.conf.erb'),
|
||||
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,
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user