opendev/system-config
Code Issues Proposed changes

Merge "Install nss-devel on proposal slave"

Browse Source
This commit is contained in:
Jenkins 2016-09-30 14:22:20 +00:00 committed by Gerrit Code Review
commit 68936b4617
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,7 @@ class openstack_project::jenkins_params {
Package['cgroups'], Package['cgroups'],
Package['cgroups-tools'], Package['cgroups-tools'],
] ]
$nss_devel = 'nss-devel'
} else { } else {
$mysql_dev_package = 'mariadb-devel' $mysql_dev_package = 'mariadb-devel'
$cgroups_tools_package = '' $cgroups_tools_package = ''
@ -173,6 +174,7 @@ class openstack_project::jenkins_params {
$swig = "swig" $swig = "swig"
$libjpeg_dev = "libjpeg-dev" $libjpeg_dev = "libjpeg-dev"
$zlib_dev = "zlib1g-dev" $zlib_dev = "zlib1g-dev"
$nss_devel = 'libnss3-dev'
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).") fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")

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

@ -51,6 +51,7 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::swig, # for oslo.messaging pyngus/proton $::openstack_project::jenkins_params::swig, # for oslo.messaging pyngus/proton
$::openstack_project::jenkins_params::libjpeg_dev, # for sphinx Pillow dep $::openstack_project::jenkins_params::libjpeg_dev, # for sphinx Pillow dep
$::openstack_project::jenkins_params::zlib_dev, # for sphinx Pillow dep $::openstack_project::jenkins_params::zlib_dev, # for sphinx Pillow dep
$::openstack_project::jenkins_params::nss_devel, # for python-nss
] ]
package { $packages: package { $packages: