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>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 9866a58f3fa5a6de583336e0007e33e9095b0ecf..ccd6274ca62f2e1269709339309d5fcdebb1150a 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -534,7 +534,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 f9a2211762f6858c53a69233b96acd48796000df..5aabf9f901c934dfd5d790a9f8994515f153fa96 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -534,7 +534,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 d4f1a96f0948a963084fb658dd1fcee34ee39c9d..875666a7544a63a68024a5a99a3d80fd370b9f4b 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -526,7 +526,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: