From 11691274f25310a8f6ccfa479f4a65a0cd314ab5 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Mon, 29 Jun 2020 11:04:08 +0530
Subject: [PATCH] Remove usage of cinder::ceilometer class

The class was deprecated and now removed with [1],
this patch cleans it's usage and use recommended
class to set notification driver.

[1] https://review.opendev.org/#/c/737492/

Also remove epel repos as packages from it
conflicts with RDO repos.

Change-Id: Ie4432221bdb795dd03f1477609b792ae8400a5fc
---
 .../puppet/modules/packstack/manifests/cinder/ceilometer.pp   | 4 ----
 .../puppet/modules/packstack/manifests/cinder/rabbitmq.pp     | 1 +
 packstack/puppet/templates/controller.pp                      | 3 ---
 playbooks/packstack-centos8-pre.yaml                          | 2 ++
 4 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 packstack/puppet/modules/packstack/manifests/cinder/ceilometer.pp

diff --git a/packstack/puppet/modules/packstack/manifests/cinder/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/cinder/ceilometer.pp
deleted file mode 100644
index a33e79117..000000000
--- a/packstack/puppet/modules/packstack/manifests/cinder/ceilometer.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class packstack::cinder::ceilometer ()
-{
-    class { '::cinder::ceilometer': }
-}
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
index f32f79873..3ef79abb0 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
@@ -33,5 +33,6 @@ class packstack::cinder::rabbitmq ()
       kombu_ssl_ca_certs    => $kombu_ssl_ca_certs,
       kombu_ssl_keyfile     => $kombu_ssl_keyfile,
       kombu_ssl_certfile    => $kombu_ssl_certfile,
+      notification_driver   => 'messagingv2',
     }
 }
diff --git a/packstack/puppet/templates/controller.pp b/packstack/puppet/templates/controller.pp
index 393d36780..10249c835 100644
--- a/packstack/puppet/templates/controller.pp
+++ b/packstack/puppet/templates/controller.pp
@@ -42,9 +42,6 @@ if hiera('CONFIG_CINDER_INSTALL') == 'y' {
   include '::packstack::keystone::cinder'
   include '::packstack::cinder::rabbitmq'
   include '::packstack::cinder'
-  if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
-    include '::packstack::cinder::ceilometer'
-  }
   if hiera('CONFIG_SWIFT_INSTALL') == 'y' {
     include '::packstack::cinder::backup'
   }
diff --git a/playbooks/packstack-centos8-pre.yaml b/playbooks/packstack-centos8-pre.yaml
index 11645891a..fa717c2a4 100644
--- a/playbooks/packstack-centos8-pre.yaml
+++ b/playbooks/packstack-centos8-pre.yaml
@@ -15,6 +15,8 @@
           set -e
           set -x
           rm -rf /etc/yum.repos.d/delorean*
+          # Remove epel repos
+          rm -rf /etc/yum.repos.d/epel*
           dnf clean all
           sudo sed -i '/^exclude.*/d' /etc/dnf/dnf.conf
           dnf -y install libxml2-devel libxslt-devel ruby-devel zlib-devel