opendev/system-config
Code Issues Proposed changes

Remove docbook packages

Browse Source 
We do not build docbook anymore in openstack-manuals, liberty was the
last release. Remove requirements for these packages, we don't need them
anymore on systems.

Change-Id: Id5a0d4aec72dea68588de8ec54e7fe9283e73e36
This commit is contained in:
Andreas Jaeger 2017-04-02 18:32:44 +02:00
parent dc80d13291
commit 9c52508d34
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -10,9 +10,6 @@ class openstack_project::jenkins_params {
$ant_package = 'ant' $ant_package = 'ant'
$awk_package = 'gawk' $awk_package = 'gawk'
$asciidoc_package = 'asciidoc' $asciidoc_package = 'asciidoc'
$docbook_xml_package = 'docbook-style-xsl'
$docbook5_xml_package = 'docbook5-schemas'
$docbook5_xsl_package = 'docbook5-style-xsl'
$firefox_package = 'firefox' $firefox_package = 'firefox'
$graphviz_package = 'graphviz' $graphviz_package = 'graphviz'
$libcurl_dev_package = 'libcurl-devel' $libcurl_dev_package = 'libcurl-devel'
@ -20,7 +17,6 @@ class openstack_project::jenkins_params {
# $libjerasure_dev_package = 'libjerasure-devel' not yet available # $libjerasure_dev_package = 'libjerasure-devel' not yet available
$librrd_dev_package = 'rrdtool-devel' $librrd_dev_package = 'rrdtool-devel'
# packages needed by document translation # packages needed by document translation
$gnome_doc_package = 'gnome-doc-utils'
$gettext_package = 'gettext' $gettext_package = 'gettext'
$language_fonts_packages = [] $language_fonts_packages = []
# for keystone ldap auth integration # for keystone ldap auth integration
@ -98,9 +94,6 @@ class openstack_project::jenkins_params {
$ant_package = 'ant' $ant_package = 'ant'
$awk_package = 'gawk' $awk_package = 'gawk'
$asciidoc_package = 'asciidoc' $asciidoc_package = 'asciidoc'
$docbook_xml_package = 'docbook-xml'
$docbook5_xml_package = 'docbook5-xml'
$docbook5_xsl_package = 'docbook-xsl'
$firefox_package = 'firefox' $firefox_package = 'firefox'
$graphviz_package = 'graphviz' $graphviz_package = 'graphviz'
$libcurl_dev_package = 'libcurl4-gnutls-dev' $libcurl_dev_package = 'libcurl4-gnutls-dev'
@ -111,7 +104,6 @@ class openstack_project::jenkins_params {
$libjerasure_dev_package = 'libjerasure-dev' $libjerasure_dev_package = 'libjerasure-dev'
$librrd_dev_package = 'librrd-dev' $librrd_dev_package = 'librrd-dev'
# packages needed by document translation # packages needed by document translation
$gnome_doc_package = 'gnome-doc-utils'
$gettext_package = 'gettext' $gettext_package = 'gettext'
$language_fonts_packages = ['fonts-takao', 'fonts-nanum'] $language_fonts_packages = ['fonts-takao', 'fonts-nanum']
# for keystone ldap auth integration # for keystone ldap auth integration

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

@ -10,12 +10,8 @@ class openstack_project::thick_slave(
$packages = [ $packages = [
$::openstack_project::jenkins_params::ant_package, # for building buck $::openstack_project::jenkins_params::ant_package, # for building buck
$::openstack_project::jenkins_params::awk_package, # for building extract_docs.awk to work correctly $::openstack_project::jenkins_params::awk_package, # for building extract_docs.awk to work correctly
$::openstack_project::jenkins_params::asciidoc_package, # for building gerrit/building openstack docs $::openstack_project::jenkins_params::asciidoc_package, # for building gerrit
$::openstack_project::jenkins_params::docbook_xml_package, # for building openstack docs
$::openstack_project::jenkins_params::docbook5_xml_package, # for building openstack docs
$::openstack_project::jenkins_params::docbook5_xsl_package, # for building openstack docs
$::openstack_project::jenkins_params::gettext_package, # for msgfmt, used in translating manuals $::openstack_project::jenkins_params::gettext_package, # for msgfmt, used in translating manuals
$::openstack_project::jenkins_params::gnome_doc_package, # for generating translation files for docs
$::openstack_project::jenkins_params::graphviz_package, # for generating graphs in docs $::openstack_project::jenkins_params::graphviz_package, # for generating graphs in docs
$::openstack_project::jenkins_params::firefox_package, # for selenium tests $::openstack_project::jenkins_params::firefox_package, # for selenium tests
$::openstack_project::jenkins_params::language_fonts_packages, $::openstack_project::jenkins_params::language_fonts_packages,