From 3b2e75378dc42be936c80e4060f9f648124e1f65 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 24 Jul 2023 01:41:09 +0900
Subject: [PATCH] Stop creating /var/lib/ceph/radosgw

The rpm spec was updated in v9.0.2 (Infernalis release)[1] and
the directory is created by the package.

Because currently we support only Luminous (which is the oldest version
used with stable/train) we no longer need to maintain the workaround
for very old package versions.

[1] https://github.com/ceph/ceph/commit/bf93128f664ac74383806530a1f974edde8df5b6

Change-Id: Idd085c566cdc06a117227e67a728af7e5c2abd5e
---
 manifests/rgw.pp              | 13 ++-----------
 spec/defines/ceph_rgw_spec.rb |  6 ------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/manifests/rgw.pp b/manifests/rgw.pp
index 139aa992..20140c56 100644
--- a/manifests/rgw.pp
+++ b/manifests/rgw.pp
@@ -169,11 +169,6 @@ define ceph::rgw (
   }
 
   # Data directory for radosgw
-  file { '/var/lib/ceph/radosgw': # missing in redhat pkg
-    ensure                  => directory,
-    mode                    => '0755',
-    selinux_ignore_defaults => true,
-  }
   file { $rgw_data:
     ensure                  => directory,
     owner                   => 'root',
@@ -202,11 +197,7 @@ define ceph::rgw (
   }
 
   Ceph_config<||> ~> Service<| tag == 'ceph-radosgw' |>
-  Package<| tag == 'ceph' |> -> File['/var/lib/ceph/radosgw']
-  Package<| tag == 'ceph' |> -> File[$log_file]
-  File['/var/lib/ceph/radosgw']
-  -> File[$rgw_data]
-  -> Service<| tag == 'ceph-radosgw' |>
-  File[$log_file] -> Service<| tag == 'ceph-radosgw' |>
+  Package<| tag == 'ceph' |> -> File[$log_file] -> Service<| tag == 'ceph-radosgw' |>
+  Package<| tag == 'ceph' |> -> File[$rgw_data] -> Service<| tag == 'ceph-radosgw' |>
   Ceph::Pool<||> -> Service<| tag == 'ceph-radosgw' |>
 }
diff --git a/spec/defines/ceph_rgw_spec.rb b/spec/defines/ceph_rgw_spec.rb
index d25597c9..035f7487 100644
--- a/spec/defines/ceph_rgw_spec.rb
+++ b/spec/defines/ceph_rgw_spec.rb
@@ -41,12 +41,6 @@ describe 'ceph::rgw' do
       it { should contain_ceph_config('client.radosgw.gateway/rgw_swift_versioning_enabled').with_value(false) }
       it { should contain_ceph_config('client.radosgw.gateway/rgw_trust_forwarded_https').with_value(false) }
 
-      it { should contain_file('/var/lib/ceph/radosgw').with(
-        :ensure                  => 'directory',
-        :mode                    => '0755',
-        :selinux_ignore_defaults => true,
-      )}
-
       it { should contain_file('/var/lib/ceph/radosgw/ceph-radosgw.gateway').with(
         :ensure                  => 'directory',
         :owner                   => 'root',