opendev
/
system-config
Code Issues Proposed changes

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
This commit is contained in:
Arx Cruz 2014-01-30 13:53:31 -02:00
parent dcee3ce25e
commit 77966dcaf5
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'],

28
modules/jenkins/manifests/slave.pp
View File

@ -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':