Split haveged into its own class

We need it on KDC hosts too, so let's split it out so we can consume
it there.

Change-Id: Ib913694cc0fb9d09b1560acfde0b771192da3fdc
This commit is contained in:
Monty Taylor 2014-10-19 11:58:57 -07:00
parent 921c6cff3e
commit ecb6b54b5f
3 changed files with 14 additions and 7 deletions

View File

@ -0,0 +1,13 @@
# Install and run haveged to provide entropy
class haveged {
package { 'haveged':
ensure => present,
}
service { 'haveged':
enable => true,
require => Package[haveged],
}
}

View File

@ -10,7 +10,6 @@ class jenkins::params {
$jdk_package = 'java-1.7.0-openjdk-devel'
$ccache_package = 'ccache'
$python_netaddr_package = 'python-netaddr'
$haveged_package = 'haveged'
# FIXME: No Maven packages on RHEL
#$maven_package = 'maven'
$cgroups_package = 'libcgroup'
@ -35,7 +34,6 @@ class jenkins::params {
$jdk_package = 'openjdk-7-jdk'
$ccache_package = 'ccache'
$python_netaddr_package = 'python-netaddr'
$haveged_package = 'haveged'
$maven_package = 'maven2'
$ruby1_9_1_package = 'ruby1.9.1'
$ruby1_9_1_dev_package = 'ruby1.9.1-dev'

View File

@ -9,6 +9,7 @@ class jenkins::slave(
$gerrituser = 'jenkins',
) {
include haveged
include pip
include jenkins::params
@ -29,7 +30,6 @@ class jenkins::slave(
$::jenkins::params::jdk_package, # jdk for building java jobs
$::jenkins::params::ccache_package,
$::jenkins::params::python_netaddr_package, # Needed for devstack address_in_net()
$::jenkins::params::haveged_package, # entropy is useful to have
]
file { '/etc/apt/sources.list.d/cloudarchive.list':
@ -172,8 +172,4 @@ class jenkins::slave(
mode => '0755',
}
service { 'haveged':
enable => true,
require => Package[$::jenkins::params::haveged_package],
}
}