opendev/system-config
Code Issues Proposed changes

Merge "Change mysql-devel to community-mysql-devel in Fedora"

Browse Source
This commit is contained in:
Jenkins 2014-01-27 19:09:41 +00:00 committed by Gerrit Code Review
commit 8b7150a2b3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/jenkins/manifests/params.pp
View File

@ -27,7 +27,6 @@ class jenkins::params {
$libtidy_package = 'libtidy' $libtidy_package = 'libtidy'
# for keystone ldap auth integration # for keystone ldap auth integration
$libsasl_dev = 'cyrus-sasl-devel' $libsasl_dev = 'cyrus-sasl-devel'
$mysql_dev_package = 'mysql-devel'
$nspr_dev_package = 'nspr-devel' $nspr_dev_package = 'nspr-devel'
$sqlite_dev_package = 'sqlite-devel' $sqlite_dev_package = 'sqlite-devel'
$libvirt_dev_package = 'libvirt-devel' $libvirt_dev_package = 'libvirt-devel'
@ -55,7 +54,13 @@ class jenkins::params {
# FIXME: No zookeeper packages on RHEL # FIXME: No zookeeper packages on RHEL
#$zookeeper_package = 'zookeeper-server' #$zookeeper_package = 'zookeeper-server'
$cgroups_package = 'libcgroup' $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' $zookeeper_package = 'zookeeper'
$cgroups_tools_package = 'libcgroup-tools' $cgroups_tools_package = 'libcgroup-tools'
$cgconfig_require = [ $cgconfig_require = [
@ -67,6 +72,7 @@ class jenkins::params {
Package['cgroups-tools'], Package['cgroups-tools'],
] ]
} else { } else {
$mysql_dev_package = 'mysql-devel'
$cgroups_tools_package = '' $cgroups_tools_package = ''
$cgconfig_require = Package['cgroups'] $cgconfig_require = Package['cgroups']
$cgred_require = Package['cgroups'] $cgred_require = Package['cgroups']