From 77966dcaf5113bb367cff2ec0139e89b1325a251 Mon Sep 17 00:00:00 2001
From: Arx Cruz <apcruz@br.ibm.com>
Date: Thu, 30 Jan 2014 13:53:31 -0200
Subject: [PATCH] Change mysql package for Fedora >= 19 for bare-precise

For some reason, puppetlabs-mysql used by openstack-infra
only checks if the osfamily is RedHat and set the package
name to mysql-server (which doesn't exist in fedora).
I didn't check new puppetlabs-mysql releases (openstack
is using 0.6.1 and latest one is 2.1). Perhaps in future
this patch will no longer be necessary.

Change-Id: I29fb931f1fe70dcfe46dad71a4822a75b001ca5d
---
 modules/jenkins/manifests/params.pp |  1 +
 modules/jenkins/manifests/slave.pp  | 28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp
index 9b00532544..8fd48d6246 100644
--- a/modules/jenkins/manifests/params.pp
+++ b/modules/jenkins/manifests/params.pp
@@ -62,6 +62,7 @@ class jenkins::params {
         # mariadb packages.
         $mysql_dev_package = 'community-mysql-devel'
         $zookeeper_package = 'zookeeper'
+        $mysql_package = 'community-mysql'
         $cgroups_tools_package = 'libcgroup-tools'
         $cgconfig_require = [
           Package['cgroups'],
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 478cc75e03..d5f12c08fb 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -91,6 +91,12 @@ class jenkins::slave(
           package { $::jenkins::params::zookeeper_package:
               ensure => present,
           }
+          # Fedora needs community-mysql package for mysql_config
+          # command used in some gate-{project}-python27
+          # jobs in Jenkins
+          package { $::jenkins::params::mysql_package:
+              ensure => present,
+          }
       }
     }
     'Debian': {
@@ -230,13 +236,25 @@ class jenkins::slave(
   }
 
   if ($bare == false) {
-    class {'mysql::server':
-      config_hash =>  {
-        'root_password'  => 'insecure_slave',
-        'default_engine' => 'MyISAM',
-        'bind_address'   => '127.0.0.1',
+    if ($::operatingsystem == 'Fedora') and ($::operatingsystemrelease >= 19) {
+      class {'mysql::server':
+        config_hash  =>  {
+          'root_password'  => 'insecure_slave',
+          'default_engine' => 'MyISAM',
+          'bind_address'   => '127.0.0.1',
+        },
+        package_name => 'community-mysql-server',
+      }
+    } else {
+      class {'mysql::server':
+        config_hash =>  {
+          'root_password'  => 'insecure_slave',
+          'default_engine' => 'MyISAM',
+          'bind_address'   => '127.0.0.1',
+        }
       }
     }
+
     include mysql::server::account_security
 
     mysql::db { 'openstack_citest':