opendev/system-config
Code Issues Proposed changes

Remove unused nspr dependency

Browse Source 
Since change Ie38deadf190db33863c99d4610157349484ac10f ceilometer does
not use spidermonkey which needed libnspr4-dev to be installed. There's
also no other repository using the library.

Thus the requirement can be removed now.

Change-Id: I0dcc581d4c20d6b0da85495cfeb9923cb5bbee93
This commit is contained in:
Andreas Jaeger 2016-03-28 18:46:13 +02:00
parent d2b23c3a43
commit ba0367417e
3 changed files with 2 additions and 5 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

@ -26,7 +26,6 @@ class openstack_project::jenkins_params {
$language_fonts_packages = [] $language_fonts_packages = []
# for keystone ldap auth integration # for keystone ldap auth integration
$libsasl_dev = 'cyrus-sasl-devel' $libsasl_dev = 'cyrus-sasl-devel'
$nspr_dev_package = 'nspr-devel'
$sqlite_dev_package = 'sqlite-devel' $sqlite_dev_package = 'sqlite-devel'
$liberasurecode_dev_package = 'liberasurecode-devel' $liberasurecode_dev_package = 'liberasurecode-devel'
$libevent_dev_package = 'libevent-devel' $libevent_dev_package = 'libevent-devel'
@ -121,7 +120,6 @@ class openstack_project::jenkins_params {
# for keystone ldap auth integration # for keystone ldap auth integration
$libsasl_dev = 'libsasl2-dev' $libsasl_dev = 'libsasl2-dev'
$mysql_dev_package = 'libmysqlclient-dev' $mysql_dev_package = 'libmysqlclient-dev'
$nspr_dev_package = 'libnspr4-dev'
$sqlite_dev_package = 'libsqlite3-dev' $sqlite_dev_package = 'libsqlite3-dev'
$libvirt_dev_package = 'libvirt-dev' $libvirt_dev_package = 'libvirt-dev'
$libxml2_package = 'libxml2-utils' $libxml2_package = 'libxml2-utils'

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

@ -30,7 +30,6 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::redis_package, # for tooz unit tests (and others that use redis) $::openstack_project::jenkins_params::redis_package, # for tooz unit tests (and others that use redis)
$::openstack_project::jenkins_params::mongodb_package, # for ceilometer unit tests $::openstack_project::jenkins_params::mongodb_package, # for ceilometer unit tests
$::openstack_project::jenkins_params::mysql_dev_package, $::openstack_project::jenkins_params::mysql_dev_package,
$::openstack_project::jenkins_params::nspr_dev_package, # for spidermonkey, used by ceilometer
$::openstack_project::jenkins_params::sqlite_dev_package, $::openstack_project::jenkins_params::sqlite_dev_package,
$::openstack_project::jenkins_params::libvirt_dev_package, $::openstack_project::jenkins_params::libvirt_dev_package,
$::openstack_project::jenkins_params::libxml2_package, $::openstack_project::jenkins_params::libxml2_package,

4
modules/openstack_project/manifests/wheel_mirror_slave.pp
View File

@ -66,7 +66,7 @@ class openstack_project::wheel_mirror_slave (
'libffi-dev', 'libreadline-dev', 'libffi-dev', 'libreadline-dev',
'libssl-dev', 'libyaml-dev', 'zlib1g-dev', 'libssl-dev', 'libyaml-dev', 'zlib1g-dev',
'libldap2-dev', 'libmysqlclient-dev', 'libldap2-dev', 'libmysqlclient-dev',
'libnspr4-dev', 'libpq-dev', 'libsasl2-dev', 'libpq-dev', 'libsasl2-dev',
'libsqlite3-dev', 'libvirt-dev', 'libzmq-dev', 'libsqlite3-dev', 'libvirt-dev', 'libzmq-dev',
'pkg-config', 'swig', 'uuid-dev']) 'pkg-config', 'swig', 'uuid-dev'])
} }
@ -77,7 +77,7 @@ class openstack_project::wheel_mirror_slave (
'libffi-devel', 'readline-devel', 'libffi-devel', 'readline-devel',
'openssl-devel', 'libyaml-devel', 'zlib-devel', 'openssl-devel', 'libyaml-devel', 'zlib-devel',
'openldap-devel', 'mariadb-devel', 'openldap-devel', 'mariadb-devel',
'nspr-devel', 'postgresql-devel', 'cyrus-sasl-devel', 'postgresql-devel', 'cyrus-sasl-devel',
'sqlite-devel', 'libvirt-devel', 'zeromq-devel', 'sqlite-devel', 'libvirt-devel', 'zeromq-devel',
'pkgconfig', 'swig', 'uuid-devel']) 'pkgconfig', 'swig', 'uuid-devel'])
} }