opendev/system-config
Code Issues Proposed changes

Merge "Remove obsolete dvipng install"

Browse Source
This commit is contained in:
Jenkins 2016-03-02 15:28:24 +00:00 committed by Gerrit Code Review
commit 66730ff76e
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,13 +85,11 @@ class openstack_project::jenkins_params {
Package['cgroups'], Package['cgroups'],
Package['cgroups-tools'], Package['cgroups-tools'],
] ]
$dvipng_package = 'texlive-dvipng'
} else { } else {
$mysql_dev_package = 'mysql-devel' $mysql_dev_package = 'mysql-devel'
$cgroups_tools_package = '' $cgroups_tools_package = ''
$cgconfig_require = Package['cgroups'] $cgconfig_require = Package['cgroups']
$cgred_require = Package['cgroups'] $cgred_require = Package['cgroups']
$dvipng_package = 'dvipng'
} }
$uuid_dev = "libuuid-devel" $uuid_dev = "libuuid-devel"
@ -108,7 +106,6 @@ class openstack_project::jenkins_params {
$docbook_xml_package = 'docbook-xml' $docbook_xml_package = 'docbook-xml'
$docbook5_xml_package = 'docbook5-xml' $docbook5_xml_package = 'docbook5-xml'
$docbook5_xsl_package = 'docbook-xsl' $docbook5_xsl_package = 'docbook-xsl'
$dvipng_package = 'dvipng'
$firefox_package = 'firefox' $firefox_package = 'firefox'
$graphviz_package = 'graphviz' $graphviz_package = 'graphviz'
$libcurl_dev_package = 'libcurl4-gnutls-dev' $libcurl_dev_package = 'libcurl4-gnutls-dev'

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

@ -12,7 +12,6 @@ class openstack_project::thick_slave(
$::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/building openstack docs
$::openstack_project::jenkins_params::curl_package, $::openstack_project::jenkins_params::curl_package,
$::openstack_project::jenkins_params::dvipng_package, # for generating image (ie: math) in docs
$::openstack_project::jenkins_params::docbook_xml_package, # for building openstack docs $::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_xml_package, # for building openstack docs
$::openstack_project::jenkins_params::docbook5_xsl_package, # for building openstack docs $::openstack_project::jenkins_params::docbook5_xsl_package, # for building openstack docs