opendev/system-config
Code Issues Proposed changes

Merge "Remove obsolete pandoc install"

Browse Source
This commit is contained in:
Jenkins 2016-03-02 15:28:13 +00:00 committed by Gerrit Code Review
commit 324b05be55
2 changed files with 0 additions and 3 deletions
modules/openstack_project/manifests
jenkins_params.ppthick_slave.pp

2
modules/openstack_project/manifests/jenkins_params.pp

@ -45,7 +45,6 @@ class openstack_project::jenkins_params {
$redis_package = 'redis'
# For Ceilometer unit tests
$mongodb_package = 'mongodb-server'
$pandoc_package = 'pandoc'
$pkgconfig_package = 'pkgconfig'
# FIXME: no PyPy headers on RHEL
# FIXME: no PyPy on RHEL
@ -141,7 +140,6 @@ class openstack_project::jenkins_params {
$redis_package = 'redis-server'
# For Ceilometer unit tests
$mongodb_package = 'mongodb'
$pandoc_package = 'pandoc'
$pkgconfig_package = 'pkg-config'
$pypy_dev_package = 'pypy-dev'
$pypy_package = 'pypy'

1
modules/openstack_project/manifests/thick_slave.pp

@ -39,7 +39,6 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::libxml2_dev_package, # for xmllint, need for wadl
$::openstack_project::jenkins_params::libxslt_dev_package,
$::openstack_project::jenkins_params::libffi_dev_package, # xattr's cffi dependency
$::openstack_project::jenkins_params::pandoc_package, #for docs, markdown->docbook, bug 924507
$::openstack_project::jenkins_params::pkgconfig_package, # for spidermonkey, used by ceilometer
$::openstack_project::jenkins_params::python_libvirt_package,
$::openstack_project::jenkins_params::python_lxml_package, # for validating openstack manuals