From da12dde248075fc407c66dbf474f8d34fca2ec89 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 24 Jan 2022 21:05:08 +0900
Subject: [PATCH] Remove workaround for old ceph package

This is a partial revert of 0c938590d2bc7e56a04b196ee8cf835786b9a6d4
and removes workaround for old ceph package. Now python3-ceph should
be installed instead of python2-ceph.

Change-Id: Ib139a7df91cadbf9ac77eb8d94791e5865414ba9
---
 manifests/ceph.pp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index e669f972c..02124b849 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -23,17 +23,6 @@ class openstack_integration::ceph (
     $ms_bind_ipv6 = undef
   }
 
-  # FIXME(ykarel) python2-rbd is installed as a indirect dependency for 'ceph' package,
-  # but we need to install python3-rbd in Fedora until 'ceph' package is fixed.
-  if ($::operatingsystem == 'Debian') or ($::operatingsystem == 'Fedora') or
-    ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-
-    ensure_resource('package', 'python3-rbd', {
-      name   => 'python3-rbd',
-      ensure => 'present',
-    })
-  }
-
   ensure_packages(['lvm2'], {'ensure' => 'present', before  => Exec['lvm_create']})
 
   exec { 'lvm_create':