opendev/system-config
Code Issues Proposed changes

Also install libsystemd-daemon-dev on Trusty

Browse Source 
It seems on Trusty we need more than one libsystemd-dev package,
so install the splitted daemon-dev package as well. Should
address

http://logs.openstack.org/periodic/propose-requirements-constraints-master/3fde379/console.html#_2017-04-18_08_19_47_447132

Change-Id: I806662f8d592e42606b048f73b2f70de1fdf8049
This commit is contained in:
Dirk Mueller 2017-04-18 14:39:43 +02:00
parent 54d48a7eff
commit 92fb127f20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ class openstack_project::jenkins_params {
$swig = "swig" $swig = "swig"
$libjpeg_dev = "libjpeg-turbo-devel" $libjpeg_dev = "libjpeg-turbo-devel"
$zlib_dev = "zlib-devel" $zlib_dev = "zlib-devel"
$systemd_dev = 'systemd-devel' $systemd_dev_packages = ['systemd-devel']
} }
'Debian': { 'Debian': {
# packages needed by slaves # packages needed by slaves
@ -118,10 +118,10 @@ class openstack_project::jenkins_params {
$libffi_dev_package = 'libffi-dev' $libffi_dev_package = 'libffi-dev'
if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') { if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
$maven_package = 'maven' $maven_package = 'maven'
$systemd_dev = 'libsystemd-dev' $systemd_dev_packages = ['libsystemd-dev']
} else { } else {
$maven_package = 'maven2' $maven_package = 'maven2'
$systemd_dev = 'libsystemd-journal-dev' $systemd_dev_packages = ['libsystemd-journal-dev', 'libsystemd-daemon-dev']
} }
# For tooz unit tests # For tooz unit tests
$memcached_package = 'memcached' $memcached_package = 'memcached'

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

@ -48,7 +48,7 @@ class openstack_project::thick_slave(
$::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 $::openstack_project::jenkins_params::nss_devel, # for python-nss
$::openstack_project::jenkins_params::systemd_dev, # for systemd-python $::openstack_project::jenkins_params::systemd_dev_packages, # for systemd-python
] ]
package { $packages: package { $packages: