opendev/puppet-jenkins
Code Issues Proposed changes

Revert "Add third-party library for py-rrdtool, used by kwapi."

Browse Source 
Kwapi uses now python-rrdtool instead of py-rrdtool, and python-rrdtool no longer requires librrd_dev library.

Change-Id: I8e00653974a1d336ea8039a29cd458b4d5eaace0
Reviewed-on: https://review.openstack.org/20474
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Khai Do <do.khai@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
This commit is contained in:
François Rossigneux
2013-01-25 13:35:43 +00:00
committed by Jenkins
parent ee07dd6258
commit def0a448ad
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@@ -20,7 +20,6 @@ class jenkins::params {
$mod_wsgi_package = 'mod_wsgi'
$libcurl_dev_package = 'libcurl-devel'
$ldap_dev_package = 'openldap-devel'
$librrd_dev_package = 'rrdtool-devel'
# for keystone ldap auth integration
$libsasl_dev = 'cyrus-sasl-devel'
$mysql_dev_package = 'mysql-devel'
@@ -62,7 +61,6 @@ class jenkins::params {
$mod_wsgi_package = 'libapache2-mod-wsgi'
$libcurl_dev_package = 'libcurl4-gnutls-dev'
$ldap_dev_package = 'libldap2-dev'
$librrd_dev_package = 'librrd-dev'
# for keystone ldap auth integration
$libsasl_dev = 'libsasl2-dev'
$mysql_dev_package = 'libmysqlclient-dev'

1
manifests/slave.pp
View File

@@ -36,7 +36,6 @@ class jenkins::slave(
$::jenkins::params::mod_wsgi_package,
$::jenkins::params::libcurl_dev_package,
$::jenkins::params::ldap_dev_package,
$::jenkins::params::librrd_dev_package, # for py-rrdtool, used by kwapi
$::jenkins::params::libsasl_dev, # for keystone ldap auth integration
$::jenkins::params::mysql_dev_package,
$::jenkins::params::nspr_dev_package, # for spidermonkey, used by ceilometer