From ef399b91af6442c4df2ce0d87644767b1a2c4877 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 12 Sep 2013 17:38:19 +0000 Subject: [PATCH] Add a Jenkins slave for triggering salt commands This is the skeleton we'll fill out with any additional functionality needed by the salt-trigger slave. Change-Id: I928c2fa4c64e69140b673615a8c18e4eea79e952 --- manifests/site.pp | 7 +++++++ .../manifests/salt_trigger_slave.pp | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 modules/openstack_project/manifests/salt_trigger_slave.pp diff --git a/manifests/site.pp b/manifests/site.pp index 142018b945..1b23a12359 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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 diff --git a/modules/openstack_project/manifests/salt_trigger_slave.pp b/modules/openstack_project/manifests/salt_trigger_slave.pp new file mode 100644 index 0000000000..63e3e1b718 --- /dev/null +++ b/modules/openstack_project/manifests/salt_trigger_slave.pp @@ -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, + } + +}