diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index ba15f6cf3c..c00ae2d4ae 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -27,7 +27,6 @@ class jenkins::params { $libtidy_package = 'libtidy' # for keystone ldap auth integration $libsasl_dev = 'cyrus-sasl-devel' - $mysql_dev_package = 'mysql-devel' $nspr_dev_package = 'nspr-devel' $sqlite_dev_package = 'sqlite-devel' $libvirt_dev_package = 'libvirt-devel' @@ -55,7 +54,13 @@ class jenkins::params { # FIXME: No zookeeper packages on RHEL #$zookeeper_package = 'zookeeper-server' $cgroups_package = 'libcgroup' - if ($::operatingsystem == 'Fedora') { + if ($::operatingsystem == 'Fedora') and ($::operatingsystemrelease >= 19) { + # From Fedora 19 and onwards there's no longer + # support to mysql-devel. + # Only community-mysql-devel. If you try to + # install mysql-devel you get a conflict with + # mariadb packages. + $mysql_dev_package = 'community-mysql-devel' $zookeeper_package = 'zookeeper' $cgroups_tools_package = 'libcgroup-tools' $cgconfig_require = [ @@ -67,6 +72,7 @@ class jenkins::params { Package['cgroups-tools'], ] } else { + $mysql_dev_package = 'mysql-devel' $cgroups_tools_package = '' $cgconfig_require = Package['cgroups'] $cgred_require = Package['cgroups']