From c624680a7dfe74d14de0fc520d2632fb22d03cdd Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 24 Feb 2016 20:30:56 +0100
Subject: [PATCH] Remove obsolete pandoc install
pandoc was used in the past for building identity-api and image-api,
these are now retired.
A search using codesearch.openstack.org shows only a usage in terracotta
and that one is not invoked anywhere in infra scripts.
Corresponding project-config change:
Id2e2278e160fa22e75ffbc15a8f9e233c9eeb7e9
Change-Id: I83050f32dd45330831e01c9828ff75a924469f82
---
modules/openstack_project/manifests/jenkins_params.pp | 2 --
modules/openstack_project/manifests/thick_slave.pp | 1 -
2 files changed, 3 deletions(-)
diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp
index f80025e00e..107678e86f 100644
--- a/modules/openstack_project/manifests/jenkins_params.pp
+++ b/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'
diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp
index 7fcc26da34..8dcc9b6bb9 100644
--- a/modules/openstack_project/manifests/thick_slave.pp
+++ b/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