fc249c341f
Just to be confusing our bare-precise images are not actually bare jenkins slave images and things will break if they are. Make the jenkins::slave bare flag selectable in the single_use_slave manifest and set it to true on the bare precise nodes (keep it set to false on anything running devstack or similar). Change-Id: I88d0a7f7b9c188ac3547b9ffab57c5fbce4f7a10
32 lines
1.1 KiB
Puppet
32 lines
1.1 KiB
Puppet
# == Class: openstack_project::single_use_slave
|
|
#
|
|
# This class configures single use Jenkins slaves with a few
|
|
# toggleable options. Most importantly sudo rights for the Jenkins
|
|
# user are by default off but can be enabled. Also, automatic_upgrades
|
|
# are off by default as the assumption is the backing image for
|
|
# this single use slaves will be refreshed with new packages
|
|
# periodically.
|
|
class openstack_project::single_use_slave (
|
|
$certname = $::fqdn,
|
|
$install_users = true,
|
|
$sudo = false,
|
|
$bare = true,
|
|
$automatic_upgrades = false,
|
|
$ssh_key = $openstack_project::jenkins_ssh_key
|
|
) inherits openstack_project {
|
|
class { 'openstack_project::template':
|
|
certname => $certname,
|
|
automatic_upgrades => $automatic_upgrades,
|
|
install_users => $install_users,
|
|
# Port 8000 from the devstack neutron public net to allow
|
|
# nova servers to reach heat-api-cfn
|
|
iptables_rules4 =>
|
|
['-p tcp --dport 8000 -s 172.24.4.0/24 -j ACCEPT'],
|
|
}
|
|
class { 'jenkins::slave':
|
|
ssh_key => $ssh_key,
|
|
sudo => $sudo,
|
|
bare => $bare,
|
|
}
|
|
}
|