opendev/system-config
Code Issues Proposed changes

Merge "Add a Jenkins slave for triggering salt commands"

Browse Source
This commit is contained in:
Jenkins 2013-09-13 15:59:26 +00:00 committed by Gerrit Code Review
commit 397a8244ff
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -474,6 +474,13 @@ node 'pypi.slave.openstack.org' {
}
}
node 'salt-trigger.slave.openstack.org' {
include openstack_project
class { 'openstack_project::salt_trigger_slave':
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
}
}
node /^precise-?\d+.*\.slave\.openstack\.org$/ {
include openstack_project
include openstack_project::puppet_cron

13
modules/openstack_project/manifests/salt_trigger_slave.pp Normal file
View File

@ -0,0 +1,13 @@
# Slave used for automatically triggering commands on the salt master.
#
# == Class: openstack_project::salt_trigger_slave
#
class openstack_project::salt_trigger_slave (
$jenkins_ssh_public_key = ''
) {
class { 'openstack_project::slave':
jenkins_ssh_public_key => $jenkins_ssh_public_key,
}
}