Fix jenkins ssh key dependency in slave template.

The jenkins slave template manifest depends on having the jenkins ssh
key variable in scope. To make this happen have
openstack_project::slave_template inherit openstack_project which
includes the ssh key variable.

Change-Id: I231f030e42e7bb2cf780f04f2a3ca1e668cf61f9
Reviewed-on: https://review.openstack.org/14186
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-10-08 15:20:50 -07:00 committed by Jenkins
parent 8001eedbea
commit cd9e56e6e6

View File

@ -1,8 +1,7 @@
class openstack_project::slave_template(
class openstack_project::slave_template (
$install_users=true,
$ssh_key=$openstack_project::jenkins_ssh_key
) {
include openstack_project
) inherits openstack_project {
class { 'openstack_project::template':
iptables_public_tcp_ports => [],
install_users => $install_users,