openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix mariadb-libs issue for non p-o-i jobs

Browse Source 
CentOS 7.3 ships a new version of mariadb-libs which
conflicts with the version in RDO.

For p-o-i scenarios jobs this has been fixed in
https://review.openstack.org/#/c/403164/ but rspec
jobs which use openstack_integration::repos but not
run_tests.sh are still failing.

This should be reverted once a new non-conflicting package
is released by RDO.

Change-Id: Ib43ac25f96994c9373fd1e848f229ec713dd54b7
This commit is contained in:
Alfredo Moralejo 2016-12-16 11:43:11 -05:00
parent 05f164fe83
commit 3b6bc5bb3e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/mysql.pp
View File

@ -2,4 +2,13 @@ class openstack_integration::mysql {
class { '::mysql::server': } class { '::mysql::server': }
# FIXME (amoralej) Required until a new release of mariadb-libs is released by RDO
if $::osfamily == 'RedHat' {
package { 'mariadb-libs':
ensure => 'latest'
}
Package['mariadb-libs'] -> Class['mysql::server']
Package['mariadb-libs'] -> Class['mysql::client']
}
} }