From 770611b4e5647866eed3260e379c156823b22b48 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 29 Mar 2016 20:02:09 +0200 Subject: [PATCH] Remove libtidy install libtidy was needed "for python-tidy, used by sphinxcontrib-docbookrestapi". sphinxcontrib-docbookrestapi is retired as stackforge project. There are three repositories using it in test-requirements but those do not build any documents - and installing sphinxcontrib-docbookrestapi works even without libtidy installed. libtidy is in bindep-fallback, so can get removed here. Change-Id: I2140917471b09e4d4d53652f4d608ea4c7df65db --- 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 635abae753..89c35215db 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -21,7 +21,6 @@ class openstack_project::jenkins_params { $librrd_dev_package = 'rrdtool-devel' # packages needed by document translation $gnome_doc_package = 'gnome-doc-utils' - $libtidy_package = 'libtidy' $gettext_package = 'gettext' $language_fonts_packages = [] # for keystone ldap auth integration @@ -114,7 +113,6 @@ class openstack_project::jenkins_params { $librrd_dev_package = 'librrd-dev' # packages needed by document translation $gnome_doc_package = 'gnome-doc-utils' - $libtidy_package = 'libtidy-0.99-0' $gettext_package = 'gettext' $language_fonts_packages = ['fonts-takao', 'fonts-nanum'] # for keystone ldap auth integration diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index ddcd2fea88..aa272e113c 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -24,7 +24,6 @@ class openstack_project::thick_slave( $::openstack_project::jenkins_params::libpcap_dev_package, # for pypcap egg $::openstack_project::jenkins_params::ldap_dev_package, $::openstack_project::jenkins_params::librrd_dev_package, # for python-rrdtool, used by kwapi - $::openstack_project::jenkins_params::libtidy_package, # for python-tidy, used by sphinxcontrib-docbookrestapi $::openstack_project::jenkins_params::libsasl_dev, # for keystone ldap auth integration $::openstack_project::jenkins_params::memcached_package, # for tooz unit tests $::openstack_project::jenkins_params::redis_package, # for tooz unit tests (and others that use redis)