From 51773ebf6024031d78f849f6915e9dd1f7cc8871 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 24 Jul 2023 02:22:40 +0900
Subject: [PATCH] Fix ignored ceph::rgw::rgw_data

This parameter was used for directory creation but has never been
added to the config file properly. This ensures the rgw_data option is
set so that the specified directory is used to store data.

Change-Id: I2cf5510e21de2879e1f0aa458a98e70b85e4ac0f
---
 manifests/rgw.pp                                      | 5 +++--
 releasenotes/notes/fix-rgw_data-48975d33de86148e.yaml | 6 ++++++
 spec/defines/ceph_rgw_spec.rb                         | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/fix-rgw_data-48975d33de86148e.yaml

diff --git a/manifests/rgw.pp b/manifests/rgw.pp
index 20140c56..d3f1f3c5 100644
--- a/manifests/rgw.pp
+++ b/manifests/rgw.pp
@@ -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;
diff --git a/releasenotes/notes/fix-rgw_data-48975d33de86148e.yaml b/releasenotes/notes/fix-rgw_data-48975d33de86148e.yaml
new file mode 100644
index 00000000..94b48e42
--- /dev/null
+++ b/releasenotes/notes/fix-rgw_data-48975d33de86148e.yaml
@@ -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.
diff --git a/spec/defines/ceph_rgw_spec.rb b/spec/defines/ceph_rgw_spec.rb
index 035f7487..56333611 100644
--- a/spec/defines/ceph_rgw_spec.rb
+++ b/spec/defines/ceph_rgw_spec.rb
@@ -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('/') }