From e5c9deed11089404deb5e0213810bbeb5d0ed559 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 9 Aug 2012 15:10:02 -0400
Subject: [PATCH] Add in a parameter to help non-us devstack-gate.

Change-Id: Ia0b5c80c479f8acd5cc1e0dc0a4515d88e6b5db8
Reviewed-on: https://review.openstack.org/11091
Reviewed-by: Devananda van der Veen <devananda.vdv@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 modules/openstack_project/manifests/slave_template.pp | 10 +++++++---
 modules/openstack_project/manifests/template.pp       |  9 +++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/manifests/slave_template.pp b/modules/openstack_project/manifests/slave_template.pp
index 5229f32f22..ebcdd39558 100644
--- a/modules/openstack_project/manifests/slave_template.pp
+++ b/modules/openstack_project/manifests/slave_template.pp
@@ -1,10 +1,14 @@
-class openstack_project::slave_template {
+class openstack_project::slave_template(
+  $install_users=true,
+  $ssh_key=$openstack_project::jenkins_ssh_key
+  ) {
   include openstack_project
   class { 'openstack_project::template':
-    iptables_public_tcp_ports => []
+    iptables_public_tcp_ports => [],
+    install_users => $install_users,
   }
   class { 'jenkins_slave':
-    ssh_key => $openstack_project::jenkins_ssh_key,
+    ssh_key => $ssh_key,
     sudo => true,
     bare => true
   }
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index c79280eb0e..aeb3eccfdd 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -1,6 +1,8 @@
 # A template host with no running services
-class openstack_project::template ($iptables_public_tcp_ports) {
-  include openstack_project::base
+class openstack_project::template (
+  $iptables_public_tcp_ports,
+  $install_users = true
+  ) {
   include ntp
   include ssh
   include snmpd
@@ -9,4 +11,7 @@ class openstack_project::template ($iptables_public_tcp_ports) {
   class { 'iptables':
     public_tcp_ports => $iptables_public_tcp_ports,
   }
+  class { 'openstack_project::base':
+    install_users => $install_users
+  }
 }