openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Stop creating /var/lib/ceph/mgr"

This commit is contained in:
Zuul 2023-07-27 10:47:56 +00:00 committed by Gerrit Code Review
parent 515b3de05d 137e568257
commit f5bd05d31e
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/mgr.pp
View File

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

6
spec/defines/ceph_mgr_spec.rb
View File

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