From 137e568257cf17f35600c5787e3b48c7c0299925 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 24 Jul 2023 01:54:15 +0900
Subject: [PATCH] Stop creating /var/lib/ceph/mgr

This directory is created by the ceph-mgr package.

Change-Id: Ib857cecf258c350ae74152eb45f301a1c41f13c3
---
 manifests/mgr.pp              | 8 +-------
 spec/defines/ceph_mgr_spec.rb | 6 ------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/manifests/mgr.pp b/manifests/mgr.pp
index 18e0a229..42ff9935 100644
--- a/manifests/mgr.pp
+++ b/manifests/mgr.pp
@@ -52,13 +52,7 @@ define ceph::mgr (
   $key                 = undef,
   Boolean $inject_key  = false,
 ) {
-  file { '/var/lib/ceph/mgr':
-    ensure  => directory,
-    owner   => 'ceph',
-    group   => 'ceph',
-    seltype => 'ceph_var_lib_t',
-    tag     => 'ceph-mgr',
-  } -> file { "/var/lib/ceph/mgr/${cluster}-${name}":
+  file { "/var/lib/ceph/mgr/${cluster}-${name}":
     ensure  => directory,
     owner   => 'ceph',
     group   => 'ceph',
diff --git a/spec/defines/ceph_mgr_spec.rb b/spec/defines/ceph_mgr_spec.rb
index 1c6a26f3..9b293432 100644
--- a/spec/defines/ceph_mgr_spec.rb
+++ b/spec/defines/ceph_mgr_spec.rb
@@ -38,12 +38,6 @@ describe 'ceph::mgr' do
         }
       end
 
-      it { should contain_file('/var/lib/ceph/mgr').with(
-        :ensure => 'directory',
-        :owner  => 'ceph',
-        :group  => 'ceph'
-      )}
-
       it { should contain_file('/var/lib/ceph/mgr/ceph-foo').with(
         :ensure => 'directory',
         :owner  => 'ceph',