From d08c9d46fa3aad19822db0d3c24cdf6ac49d1bf1 Mon Sep 17 00:00:00 2001
From: Arx Cruz <apcruz@br.ibm.com>
Date: Tue, 17 Dec 2013 17:00:42 -0200
Subject: [PATCH] Change mysql-devel to community-mysql-devel in Fedora
Fedora 19 and onwards doesn't support (officially)
mysql anymore, so installmysql-devel conflicts
with mariadb and community-mysql
Change-Id: I3142aa686747a6704396aa4fe005dc04c7e7d15b
---
modules/jenkins/manifests/params.pp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp
index c911efca72..ba2697da96 100644
--- a/modules/jenkins/manifests/params.pp
+++ b/modules/jenkins/manifests/params.pp
@@ -27,7 +27,6 @@ class jenkins::params {
$libtidy_package = 'libtidy-0.99-0'
# 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'
$libxml2_package = 'libxml2'
@@ -54,7 +53,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 = [
@@ -66,6 +71,7 @@ class jenkins::params {
Package['cgroups-tools'],
]
} else {
+ $mysql_dev_package = 'mysql-devel'
$cgroups_tools_package = ''
$cgconfig_require = Package['cgroups']
$cgred_require = Package['cgroups']