From cd9e56e6e67a251ce7c5d62616da5ee267c3300f Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 8 Oct 2012 15:20:50 -0700
Subject: [PATCH] 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
---
 modules/openstack_project/manifests/slave_template.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/openstack_project/manifests/slave_template.pp b/modules/openstack_project/manifests/slave_template.pp
index 7daf2507e9..73b4becaac 100644
--- a/modules/openstack_project/manifests/slave_template.pp
+++ b/modules/openstack_project/manifests/slave_template.pp
@@ -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,