From db55155d6613281b2eb5724e562557698a110aef Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 18 Aug 2020 17:02:24 +0200
Subject: [PATCH] python3-novaclient installation via THT

Let's require python3-novaclient via tht and host_prep_tasks
and remove the need to install it via puppet.

Change-Id: I3dbe35e2037c02cf0436b173bb42578f2a0b2db3
---
 .../pacemaker/pacemaker-baremetal-puppet.yaml       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
index 790f071763..0ab0e5a764 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -103,6 +103,12 @@ parameters:
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']
+  EnableInstanceHA:
+    default: false
+    description: Whether to enable an Instance Ha configurarion or not.
+                 This setup requires the Compute role to have the
+                 PacemakerRemote service added to it.
+    type: boolean
   PacemakerBundleOperationTimeout:
     type: string
     default: ''
@@ -204,6 +210,13 @@ outputs:
             - {get_param: PacemakerLoggingSource}
       step_config: |
         include tripleo::profile::base::pacemaker
+      host_prep_tasks:
+        # Need this until https://bugzilla.redhat.com/show_bug.cgi?id=1857247 is fixed
+        - name: Make sure python3-novaclient is installed when IHA is enabled
+          package:
+            name: python3-novaclient
+            state: present
+          when: {get_param: EnableInstanceHA}
       upgrade_tasks:
         - name: upgrade step 0
           when: step|int == 0