From 5d5d31c7c331bcab03afe8a27cd83030e9841ef8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 6 Aug 2021 21:15:43 +0900 Subject: [PATCH] Gnocchi: Use rados library in CentOS The lados library is now preferrred over cradox even in CentOS. The manage_cradox parameter is already deprecated and has no effect[1]. [1] 3591bd8acc1ac49feb2f0fa33a45a09e94e08407 Backport note: This is part of centos9 enablement in wallaby branch. In wallaby, the manage_cradox parameter is still valid so this backport ensures the parameter is set properly. Change-Id: I56a99426047c065a7a61ce7e1553782f4a8a5bd7 (cherry picked from commit 2c370226927e28de55b60b97ef3cd20221d0d6a3) --- manifests/gnocchi.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp index 323b58de6..8fdfdcbc8 100644 --- a/manifests/gnocchi.pp +++ b/manifests/gnocchi.pp @@ -78,8 +78,8 @@ class openstack_integration::gnocchi ( class { 'gnocchi::storage::ceph': ceph_username => 'openstack', ceph_keyring => '/etc/ceph/ceph.client.openstack.keyring', - manage_cradox => ($::osfamily == 'RedHat'), - manage_rados => ($::osfamily == 'Debian'), + manage_cradox => false, + manage_rados => true, } # make sure ceph pool exists before running gnocchi (dbsync & services) Exec['create-gnocchi'] -> Exec['gnocchi-db-sync']