opendev/system-config
Code Issues Proposed changes

Merge "Add liberasurecode to CI slaves for Swift/PyECLib"

Browse Source
This commit is contained in:
Jenkins 2015-12-02 20:55:09 +00:00 committed by Gerrit Code Review
commit a5fbdd5c90
2 changed files with 21 additions and 0 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

@ -29,6 +29,7 @@ class openstack_project::jenkins_params {
$libsasl_dev = 'cyrus-sasl-devel' $libsasl_dev = 'cyrus-sasl-devel'
$nspr_dev_package = 'nspr-devel' $nspr_dev_package = 'nspr-devel'
$sqlite_dev_package = 'sqlite-devel' $sqlite_dev_package = 'sqlite-devel'
$liberasurecode_dev_package = 'liberasurecode-devel'
$libevent_dev_package = 'libevent-devel' $libevent_dev_package = 'libevent-devel'
$libpcap_dev_package = 'libpcap-devel' $libpcap_dev_package = 'libpcap-devel'
$libvirt_dev_package = 'libvirt-devel' $libvirt_dev_package = 'libvirt-devel'
@ -115,6 +116,7 @@ class openstack_project::jenkins_params {
$libevent_dev_package = 'libevent-dev' $libevent_dev_package = 'libevent-dev'
$libpcap_dev_package = 'libpcap-dev' $libpcap_dev_package = 'libpcap-dev'
$ldap_dev_package = 'libldap2-dev' $ldap_dev_package = 'libldap2-dev'
$liberasurecode_dev_package = 'liberasurecode-dev'
$libjerasure_dev_package = 'libjerasure-dev' $libjerasure_dev_package = 'libjerasure-dev'
$librrd_dev_package = 'librrd-dev' $librrd_dev_package = 'librrd-dev'
# packages needed by document translation # packages needed by document translation

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

@ -134,6 +134,20 @@ class openstack_project::thick_slave(
package { $::openstack_project::jenkins_params::mysql_package: package { $::openstack_project::jenkins_params::mysql_package:
ensure => present, ensure => present,
} }
if ($::operatingsystemrelease >= 22) {
# For pyeclib, used by swift
package { $::openstack_project::jenkins_params::liberasurecode_dev_package:
ensure => present,
}
}
}
elsif ($::operatingsystem == 'CentOS') {
if ($::operatingsystemmajrelease >= '7') {
# For pyeclib, used by swift
package { $::openstack_project::jenkins_params::liberasurecode_dev_package:
ensure => present,
}
}
} }
} }
'Debian': { 'Debian': {
@ -146,6 +160,11 @@ class openstack_project::thick_slave(
package { $::openstack_project::jenkins_params::php5_mcrypt_package: package { $::openstack_project::jenkins_params::php5_mcrypt_package:
ensure => present, ensure => present,
} }
# For pyeclib, used by swift
package { $::openstack_project::jenkins_params::liberasurecode_dev_package:
ensure => present,
}
} }
} }
package { 'rake': package { 'rake':