ceph-defaults: remove rgw from ceph_conf_overrides

The [rgw] section in the ceph.conf file or via the ceph_conf_overrides
variable doesn't exist and has no effect.
To apply overrides to all radosgw instances we should use either the
[global] or [client] sections.
Overrides per radosgw instance should still use the
[client.rgw.{instance-name}] section.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1794552
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 2f07b8513158d3fc36c5b0d29386f46dd28b5efa)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index a8e2d66cf87fd3dbac4e8d916b412e1543fd3398..230fff67910e3db2693a734fb1e30e7d578f3ce0 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -520,7 +520,12 @@ dummy:
 # Ceph configuration file override.
 # This allows you to specify more configuration options
 # using an INI style format.
-# The following sections are supported: [global], [mon], [osd], [mds], [rgw]
+#
+# When configuring RGWs, make sure you use the form [client.rgw.*]
+# instead of [client.radosgw.*].
+# For more examples check the profiles directory of https://github.com/ceph/ceph-ansible.
+#
+# The following sections are supported: [global], [mon], [osd], [mds], [client]
 #
 # Example:
 # ceph_conf_overrides:

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 36d29b3bfa697614e9636470ea083a3288cfde8f..a39801fde6f64c0f2f493d8ae84fefa255e4feda 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -520,7 +520,12 @@ ceph_rhcs_version: 3
 # Ceph configuration file override.
 # This allows you to specify more configuration options
 # using an INI style format.
-# The following sections are supported: [global], [mon], [osd], [mds], [rgw]
+#
+# When configuring RGWs, make sure you use the form [client.rgw.*]
+# instead of [client.radosgw.*].
+# For more examples check the profiles directory of https://github.com/ceph/ceph-ansible.
+#
+# The following sections are supported: [global], [mon], [osd], [mds], [client]
 #
 # Example:
 # ceph_conf_overrides:

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index cb7714152b85c30b2abb2cbc94128168795a7f63..59e58146e79b33d5693fc103b4d37d1072e1ab63 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -512,7 +512,12 @@ rgw_pull_proto: "http" # should be the same as rgw_multisite_proto for the maste
 # Ceph configuration file override.
 # This allows you to specify more configuration options
 # using an INI style format.
-# The following sections are supported: [global], [mon], [osd], [mds], [rgw]
+#
+# When configuring RGWs, make sure you use the form [client.rgw.*]
+# instead of [client.radosgw.*].
+# For more examples check the profiles directory of https://github.com/ceph/ceph-ansible.
+#
+# The following sections are supported: [global], [mon], [osd], [mds], [client]
 #
 # Example:
 # ceph_conf_overrides: