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
This commit is contained in:
yatinkarel 2020-06-29 11:04:08 +05:30
parent df280619e5
commit 11691274f2
4 changed files with 3 additions and 7 deletions

View File

@ -1,4 +0,0 @@
class packstack::cinder::ceilometer ()
{
class { '::cinder::ceilometer': }
}

View File

@ -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',
}
}

View File

@ -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'
}

View File

@ -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