opendev/system-config
Code Issues Proposed changes

Merge "Add libjerasure dev packages on workers"

Browse Source
This commit is contained in:
Jenkins 2015-06-09 20:50:59 +00:00 committed by Gerrit Code Review
commit 0a33b3d325
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -18,6 +18,7 @@ class openstack_project::jenkins_params {
$graphviz_package = 'graphviz'
$libcurl_dev_package = 'libcurl-devel'
$ldap_dev_package = 'openldap-devel'
# $libjerasure_dev_package = 'libjerasure-devel' not yet available
$librrd_dev_package = 'rrdtool-devel'
# packages needed by document translation
$gnome_doc_package = 'gnome-doc-utils'
@ -107,6 +108,7 @@ class openstack_project::jenkins_params {
$graphviz_package = 'graphviz'
$libcurl_dev_package = 'libcurl4-gnutls-dev'
$ldap_dev_package = 'libldap2-dev'
$libjerasure_dev_package = 'libjerasure-dev'
$librrd_dev_package = 'librrd-dev'
# packages needed by document translation
$gnome_doc_package = 'gnome-doc-utils'

6
modules/openstack_project/manifests/thick_slave.pp
View File

@ -94,11 +94,15 @@ class openstack_project::thick_slave(
ensure => present,
}
# for pyeclib, used by swift, not available before Trusty
package { $::openstack_project::jenkins_params::libjerasure_dev_package:
ensure => present,
}
# Don't install the Ruby Gems profile script on Trusty
file { '/etc/profile.d/rubygems.sh':
ensure => absent,
}
} else {
file { '/etc/profile.d/rubygems.sh':