x
/
packstack
Code Issues Proposed changes

Support new mariadb-server-galera package 

mariadb-server-galera is now a subpackage of mariadb-server
and requires it so we can't remove it
https://bugzilla.redhat.com/show_bug.cgi?id=1310622

Change-Id: I25de6e65228257fd39df0d9ad59a56e331f16393
This commit is contained in:
Haikel Guemar 2016-03-25 10:42:29 +01:00
parent a402b86cbe
commit 89af262425
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packstack/puppet/modules/packstack/lib/facter/mariadb.rb Normal file
View File

@ -0,0 +1,14 @@
# Check if mariadb provides galera server
Facter.add(:mariadb_provides_galera) do
setcode do
if Facter.value(:operatingsystem) == 'Fedora' and Facter.value(:operatingsystemmajrelease).to_i > 22
command = 'dnf repoquery --whatprovides mariadb-galera-server'
else
command = 'repoquery --whatprovides mariadb-galera-server'
end
output = Facter::Util::Resolution.exec(command)
(output =~ /mariadb-server-galera.*/) != nil
end
end

16
packstack/puppet/templates/mariadb_install.pp
View File

@ -1,9 +1,19 @@
$max_connections = $service_workers * 128
# Package mariadb-server conflicts with mariadb-galera-server
if ($::mariadb_provides_galera == 'true') {
# Since mariadb 10.1 galera is included in main mariadb
$mariadb_package_name = 'mariadb-server-galera'
$mariadb_present = 'present'
} else {
# Package mariadb-server conflicts with mariadb-galera-server
$mariadb_package_name = 'mariadb-galera-server'
$mariadb_present = 'absent'
}
package { 'mariadb-server':
ensure => absent,
ensure => $mariadb_present,
}
$bind_address = hiera('CONFIG_IP_VERSION') ? {
@ -15,7 +25,7 @@ $bind_address = hiera('CONFIG_IP_VERSION') ? {
$mysql_root_password = hiera('CONFIG_MARIADB_PW')
class { '::mysql::server':
package_name => 'mariadb-galera-server',
package_name => $mariadb_package_name,
restart => true,
root_password => $mysql_root_password,
require => Package['mariadb-server'],