From f28b6907c799731549ece3011e5e2920201b457d Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 15 Jul 2020 16:45:35 +0200
Subject: [PATCH] Make sure python3-novaclient is installed before creating
 fence_compute

This has been observed during an IHA FFU process. Namely
after the OS upgrade by LEAPP the fence_compute resource will
fail starting because python3-novaclient is not installed.
Normally this is taken care of by rpm dependencies, but
fence_compute is buggy and does not explicitely have that
dep (https://bugzilla.redhat.com/show_bug.cgi?id=1857247)

So we need to make sure the package is installed before
creating the resource.

Tested this on four consecutive successful IHA FFU runs
and it worked okay.

NB: Cherry-pick not 100% due to relative class names

Related-Bug: #1888398

Change-Id: I6816d414409da3748b2e341ec05ebcad86ad8fd1
(cherry picked from commit c1e9447998c635a825529cff99b99ed13a4e89d7)
(cherry picked from commit c3e86ea6dc0b2f57af12a088c2086e6fc70a95b0)
---
 manifests/profile/base/pacemaker.pp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index e0d336f68..e84ee6634 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -274,8 +274,14 @@ class tripleo::profile::base::pacemaker (
     }
   }
 
-  if $enable_instanceha and $pacemaker_master {
-    include ::tripleo::profile::base::pacemaker::instance_ha
+  if $enable_instanceha {
+    if $pacemaker_master {
+      include ::tripleo::profile::base::pacemaker::instance_ha
+    }
+    # Until https://bugzilla.redhat.com/show_bug.cgi?id=1857247 is fixed we
+    # need to make sure the package is installed on the host.
+    ensure_resource('package', 'python3-novaclient', { ensure => 'installed' })
+    Package<| name == 'python3-novaclient' |> -> Pcmk_stonith<| title == 'fence-nova' |>
   }
 
   if ($step >= 2 and $pacemaker_master) {