openstack
/
puppet-ceph
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2023-07-28 05:23:12 +00:00 committed by Gerrit Code Review
parent d716b57bfa 3b2e75378d
commit 2c20097774
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/rgw.pp
View File

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

6
spec/defines/ceph_rgw_spec.rb
View File

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