From e375da24b9bfa1fe073a4bd1b309edc570902e4f Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 11 Dec 2018 12:51:01 +0100
Subject: [PATCH] Install libibverbs

Needed to fix the beaker tests issue where the
OVS output shows errors. See comment in code
for more details.

Reported upstream:
https://bugzilla.redhat.com/show_bug.cgi?id=1658141

Change-Id: Ic0090a9950552c33a79018ebf40a2c0d0260c667
---
 manifests/repos.pp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 8425e10f6..c020e7b22 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -103,20 +103,30 @@ class openstack_integration::repos {
     ceph_mirror => $ceph_mirror,
   }
 
-  # NOTE(tobias-urdin): The python-requests RPM package has a package dependency
-  # which upstream requests package does not support so it outputs a warning which
-  # messes up output (warning is printed to stdout) an causes some providers that
-  # rely on the stdout output to fail. If you upgrade the python-chardet dependency
-  # to a newer version you are fine, is reported upstream:
-  # https://bugzilla.redhat.com/show_bug.cgi?id=1620221
-  # This is added here so we have the latest of this package in both integration and
-  # beaker testing.
   if $::osfamily == 'RedHat' {
+    # NOTE(tobias-urdin): The python-requests RPM package has a package dependency
+    # which upstream requests package does not support so it outputs a warning which
+    # messes up output (warning is printed to stdout) an causes some providers that
+    # rely on the stdout output to fail. If you upgrade the python-chardet dependency
+    # to a newer version you are fine, is reported upstream:
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1620221
+    # This is added here so we have the latest of this package in both integration and
+    # beaker testing.
     package { 'python-chardet':
       ensure   => 'installed',
       provider => 'rpm',
       source   => 'http://mirror.centos.org/centos/7/cloud/x86_64/openstack-rocky/python2-chardet-3.0.4-7.el7.noarch.rpm',
     }
+
+    # NOTE(tobias-urdin): Install libibverbs to fix an issue where OVS outputs errors
+    # that causes the puppet-openvswitch module to fail parsing the output.
+    # This issue does not occur in integration testing but only beaker tests since some
+    # other package (probably nova) causes this package to be installed, or the yum upgrade
+    # part in integration catches it.
+    # Reported upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1658141
+    package { 'libibverbs':
+      ensure => 'present',
+    }
   }
 
 }