diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index de40531a8d..a85c745b54 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -69,6 +69,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 aec58c3240..83711acded 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -96,6 +96,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': { @@ -245,13 +251,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':