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 e9caf34c721b449ba1f454ca0573a8cbad980fc3..9ef31792f44aa8a7293a71085c3c57438fcdd303 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -532,7 +532,7 @@ dummy:
 # 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], [rgw]
+# 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 929fb56ebed5c1411b536c05eaec76071b19b12a..ed88558bb2dc34d6c292e69273780ea94fe5a607 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -532,7 +532,7 @@ ceph_iscsi_config_dev: false
 # 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], [rgw]
+# 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 8cba252b3d799eff5a2d7e50dd3d371fd6c6352e..e4cfe6232f809e5d06cc901dac55ec57f419fd3f 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -524,7 +524,7 @@ rgw_pull_proto: "http" # should be the same as rgw_multisite_proto for the maste
 # 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], [rgw]
+# The following sections are supported: [global], [mon], [osd], [mds], [client]
 #
 # Example:
 # ceph_conf_overrides: