opendev/system-config
Code Issues Proposed changes

Add in a parameter to help non-us devstack-gate.

Browse Source 
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
This commit is contained in:
Monty Taylor 2012-08-09 15:10:02 -04:00 committed by Jenkins
parent d10c011a03
commit e5c9deed11
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/manifests/slave_template.pp
View File

@ -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 include openstack_project
class { 'openstack_project::template': class { 'openstack_project::template':
iptables_public_tcp_ports => [] iptables_public_tcp_ports => [],
install_users => $install_users,
} }
class { 'jenkins_slave': class { 'jenkins_slave':
ssh_key => $openstack_project::jenkins_ssh_key, ssh_key => $ssh_key,
sudo => true, sudo => true,
bare => true bare => true
} }

9
modules/openstack_project/manifests/template.pp
View File

@ -1,6 +1,8 @@
# A template host with no running services # A template host with no running services
class openstack_project::template ($iptables_public_tcp_ports) { class openstack_project::template (
include openstack_project::base $iptables_public_tcp_ports,
$install_users = true
) {
include ntp include ntp
include ssh include ssh
include snmpd include snmpd
@ -9,4 +11,7 @@ class openstack_project::template ($iptables_public_tcp_ports) {
class { 'iptables': class { 'iptables':
public_tcp_ports => $iptables_public_tcp_ports, public_tcp_ports => $iptables_public_tcp_ports,
} }
class { 'openstack_project::base':
install_users => $install_users
}
} }