From 51af8d815fc8b727764d1bd234504ab77bda8d0a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 30 Sep 2016 14:32:25 +0200 Subject: [PATCH] Install nss-devel on proposal slave The job propose-requirements-constraints-master fails since nss-devel is not installed. Install it. Details: http://logs.openstack.org/periodic/propose-requirements-constraints-master/825dd06/console.html#_2016-09-30_07_23_55_926434a Change-Id: If4746e28eb9c7b07d3e5900117554fc486f4dad7 --- modules/openstack_project/manifests/jenkins_params.pp | 2 ++ modules/openstack_project/manifests/thick_slave.pp | 1 + 2 files changed, 3 insertions(+) diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index 5569df67ae..c112bf7334 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -80,6 +80,7 @@ class openstack_project::jenkins_params { Package['cgroups'], Package['cgroups-tools'], ] + $nss_devel = 'nss-devel' } else { $mysql_dev_package = 'mariadb-devel' $cgroups_tools_package = '' @@ -173,6 +174,7 @@ class openstack_project::jenkins_params { $swig = "swig" $libjpeg_dev = "libjpeg-dev" $zlib_dev = "zlib1g-dev" + $nss_devel = 'libnss3-dev' } default: { fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).") diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index 67f2d808e5..ded45371e4 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -51,6 +51,7 @@ class openstack_project::thick_slave( $::openstack_project::jenkins_params::swig, # for oslo.messaging pyngus/proton $::openstack_project::jenkins_params::libjpeg_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: