Include openstack_project for Jenkins' SSH key.

The openstack_project class needs to be included to make the
jenkins_ssh_key variable available to nodes.

Change-Id: I57fb6f24755bf123cf9f6f9b724035d0ababf8f3
Reviewed-on: https://review.openstack.org/31581
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-06-03 16:05:57 -07:00 committed by Jenkins
parent b51d23a3cd
commit d313ce581a

View File

@ -303,6 +303,7 @@ node /^ci-backup-.*\.openstack\.org$/ {
#
node 'mirror26.slave.openstack.org' {
include openstack_project
class { 'openstack_project::mirror26_slave':
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents')
@ -310,6 +311,7 @@ node 'mirror26.slave.openstack.org' {
}
node 'mirror27.slave.openstack.org' {
include openstack_project
class { 'openstack_project::mirror27_slave':
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents')
@ -317,6 +319,7 @@ node 'mirror27.slave.openstack.org' {
}
node 'devstack-launch.slave.openstack.org' {
include openstack_project
class { 'openstack_project::devstack_launch_slave':
jenkins_api_user => hiera('jenkins_api_user'),
jenkins_api_key => hiera('jenkins_api_key'),
@ -326,6 +329,7 @@ node 'devstack-launch.slave.openstack.org' {
}
node 'tx.slave.openstack.org' {
include openstack_project
class { 'openstack_project::translation_slave':
transifex_username => 'openstackjenkins',
transifex_password => hiera('transifex_password'),
@ -334,6 +338,7 @@ node 'tx.slave.openstack.org' {
}
node 'pypi.slave.openstack.org' {
include openstack_project
class { 'openstack_project::pypi_slave':
pypi_username => 'openstackci',
pypi_password => hiera('pypi_password'),