From 03e7e2d196ae6a9a65b437e8fe1a8b23c8056f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Rossigneux?= Date: Fri, 25 Jan 2013 13:35:43 +0000 Subject: [PATCH] Revert "Add third-party library for py-rrdtool, used by kwapi." 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 Reviewed-by: Khai Do Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- modules/jenkins/manifests/params.pp | 2 -- modules/jenkins/manifests/slave.pp | 1 - 2 files changed, 3 deletions(-) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index 3260f867e0..21254edb77 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -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' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 8181e84a08..14c58ee1a0 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -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