diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index e5b3f3ecde..6b85d4ac7b 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -88,7 +88,7 @@ class openstack_project::jenkins_params { $swig = "swig" $libjpeg_dev = "libjpeg-turbo-devel" $zlib_dev = "zlib-devel" - $systemd_dev = 'systemd-devel' + $systemd_dev_packages = ['systemd-devel'] } 'Debian': { # packages needed by slaves @@ -118,10 +118,10 @@ class openstack_project::jenkins_params { $libffi_dev_package = 'libffi-dev' if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') { $maven_package = 'maven' - $systemd_dev = 'libsystemd-dev' + $systemd_dev_packages = ['libsystemd-dev'] } else { $maven_package = 'maven2' - $systemd_dev = 'libsystemd-journal-dev' + $systemd_dev_packages = ['libsystemd-journal-dev', 'libsystemd-daemon-dev'] } # For tooz unit tests $memcached_package = 'memcached' diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index 99140af78a..cabc6a89e4 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -48,7 +48,7 @@ class openstack_project::thick_slave( $::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 - $::openstack_project::jenkins_params::systemd_dev, # for systemd-python + $::openstack_project::jenkins_params::systemd_dev_packages, # for systemd-python ] package { $packages: