From d100111965a487e2feaa5210d5ff2be2fbec77fd Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Wed, 21 Jul 2021 11:55:33 +0530
Subject: [PATCH] Include placement::api class

Explicitly needed post [1].

Also remove epel release rpms to avoid builds
being mixed with RDO repos and causing issues.

[1] https://review.opendev.org/c/openstack/puppet-placement/+/801268

Change-Id: I6adf1d8dd104dbd31d49bd1f5c8ec72444cd1a61
---
 packstack/puppet/modules/packstack/manifests/placement.pp | 1 +
 playbooks/packstack-centos8-pre.yaml                      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/placement.pp b/packstack/puppet/modules/packstack/manifests/placement.pp
index ea389285d..47c73d7cb 100644
--- a/packstack/puppet/modules/packstack/manifests/placement.pp
+++ b/packstack/puppet/modules/packstack/manifests/placement.pp
@@ -20,6 +20,7 @@ class packstack::placement ()
     }
 
     include placement::db::sync
+    include placement::api
 
     class { 'placement::wsgi::apache':
       bind_host => $bind_host,
diff --git a/playbooks/packstack-centos8-pre.yaml b/playbooks/packstack-centos8-pre.yaml
index fa717c2a4..39ad41309 100644
--- a/playbooks/packstack-centos8-pre.yaml
+++ b/playbooks/packstack-centos8-pre.yaml
@@ -15,8 +15,8 @@
           set -e
           set -x
           rm -rf /etc/yum.repos.d/delorean*
-          # Remove epel repos
-          rm -rf /etc/yum.repos.d/epel*
+          # Remove epel repos and release rpms
+          rm -rf /etc/yum.repos.d/epel* && dnf remove -y epel*
           dnf clean all
           sudo sed -i '/^exclude.*/d' /etc/dnf/dnf.conf
           dnf -y install libxml2-devel libxslt-devel ruby-devel zlib-devel