openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Fix ignored ceph::rgw::rgw_data"

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

5
manifests/rgw.pp
View File

@ -38,13 +38,13 @@
# Optional. Default is undef.
#
# [*rgw_data*] The path where the radosgw data should be stored.
# Optional. Default is '/var/lib/ceph/radosgw/${cluster}-${name}.
# Optional. Default is '/var/lib/ceph/radosgw/ceph-${name}.
#
# [*user*] User running the web frontend.
# Optional. Default is 'www-data'.
#
# [*keyring_path*] Location of keyring.
# Optional. Default is '/etc/ceph/${name}.keyring'.
# Optional. Default is '/etc/ceph/ceph.client.${name}.keyring'.
#
# [*log_file*] Log file to write to.
# Optional. Default is '/var/log/ceph/radosgw.log'.
@ -124,6 +124,7 @@ define ceph::rgw (
"client.${name}/keyring": value => $keyring_path;
"client.${name}/log_file": value => $log_file;
"client.${name}/user": value => $user;
"client.${name}/rgw_data": value => $rgw_data;
"client.${name}/rgw_dns_name": value => $rgw_dns_name;
"client.${name}/rgw_swift_url": value => $rgw_swift_url;
"client.${name}/rgw_swift_account_in_url": value => $rgw_swift_account_in_url;

6
releasenotes/notes/fix-rgw_data-48975d33de86148e.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
The ``ceph::rgw::rgw_data`` parameter now controls the ``rgw_data`` option
in ceph.conf so that the given directoriy path is actually used to store
data.

2
spec/defines/ceph_rgw_spec.rb
View File

@ -34,6 +34,7 @@ describe 'ceph::rgw' do
it { should contain_ceph_config('client.radosgw.gateway/host').with_value('foo') }
it { should contain_ceph_config('client.radosgw.gateway/keyring').with_value('/etc/ceph/ceph.client.radosgw.gateway.keyring') }
it { should contain_ceph_config('client.radosgw.gateway/log_file').with_value('/var/log/ceph/radosgw.log') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_data').with_value('/var/lib/ceph/radosgw/ceph-radosgw.gateway') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_dns_name').with_value('foo.example.com') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_swift_url').with_value('http://foo.example.com:7480') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_swift_url_prefix').with_value('swift') }
@ -82,6 +83,7 @@ describe 'ceph::rgw' do
it { should contain_ceph_config('client.radosgw.custom/host').with_value('foo') }
it { should contain_ceph_config('client.radosgw.custom/keyring').with_value('/etc/ceph/ceph.radosgw.custom.keyring') }
it { should contain_ceph_config('client.radosgw.custom/log_file').with_value('/var/log/ceph/mylogfile.log') }
it { should contain_ceph_config('client.radosgw.custom/rgw_data').with_value('/var/lib/ceph/radosgw/ceph-radosgw.custom') }
it { should contain_ceph_config('client.radosgw.custom/rgw_dns_name').with_value('mydns.hostname') }
it { should contain_ceph_config('client.radosgw.custom/rgw_swift_url').with_value('https://mydns.hostname:443') }
it { should contain_ceph_config('client.radosgw.custom/rgw_swift_url_prefix').with_value('/') }