From 8d195ca9b50394bbea5d7a6d5b9cdea7ed77ae58 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Fri, 11 Sep 2020 10:01:50 +0200 Subject: [PATCH] Revert "Make sure python3-novaclient is installed before creating fence_compute" This reverts commit c1e9447998c635a825529cff99b99ed13a4e89d7. as we push the package installation to THT via I3dbe35e2037c02cf0436b173bb42578f2a0b2db3 Depends-On: I3dbe35e2037c02cf0436b173bb42578f2a0b2db3 Change-Id: Iaa5451f1072f3c98aaddb1781d14f015a0ccbe0a --- manifests/profile/base/pacemaker.pp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index 0b745608a..a66f7b1a1 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -253,14 +253,8 @@ class tripleo::profile::base::pacemaker ( } } - 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 $enable_instanceha and $pacemaker_master { + include tripleo::profile::base::pacemaker::instance_ha } if ($step >= 2 and $pacemaker_master) {