From 3b6bc5bb3ee63cf23ae56cfbf7c102799f2480b4 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Fri, 16 Dec 2016 11:43:11 -0500
Subject: [PATCH] Fix mariadb-libs issue for non p-o-i jobs

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
---
 manifests/mysql.pp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 435f5f12d..8d46ed799 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -2,4 +2,13 @@ class openstack_integration::mysql {
 
   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']
+  }
+
 }