opendev/system-config
Code Issues Proposed changes

Merge "Change mysql package for Fedora >= 19 for bare-precise"

Browse Source
This commit is contained in:
Jenkins 2014-02-27 19:24:49 +00:00 committed by Gerrit Code Review
commit bf96db40f3
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

@ -69,6 +69,7 @@ class jenkins::params {
# mariadb packages. # mariadb packages.
$mysql_dev_package = 'community-mysql-devel' $mysql_dev_package = 'community-mysql-devel'
$zookeeper_package = 'zookeeper' $zookeeper_package = 'zookeeper'
$mysql_package = 'community-mysql'
$cgroups_tools_package = 'libcgroup-tools' $cgroups_tools_package = 'libcgroup-tools'
$cgconfig_require = [ $cgconfig_require = [
Package['cgroups'], Package['cgroups'],

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

@ -96,6 +96,12 @@ class jenkins::slave(
package { $::jenkins::params::zookeeper_package: package { $::jenkins::params::zookeeper_package:
ensure => present, 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': { 'Debian': {
@ -245,6 +251,16 @@ class jenkins::slave(
} }
if ($bare == false) { if ($bare == false) {
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': class {'mysql::server':
config_hash => { config_hash => {
'root_password' => 'insecure_slave', 'root_password' => 'insecure_slave',
@ -252,6 +268,8 @@ class jenkins::slave(
'bind_address' => '127.0.0.1', 'bind_address' => '127.0.0.1',
} }
} }
}
include mysql::server::account_security include mysql::server::account_security
mysql::db { 'openstack_citest': mysql::db { 'openstack_citest':