From 3daea719b65c8b8e3c54b7f97a65ae899a7d2edc Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 28 Jan 2020 10:27:34 -0500 Subject: [PATCH] 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 (cherry picked from commit 2f07b8513158d3fc36c5b0d29386f46dd28b5efa) --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index e9caf34c7..9ef31792f 100644 --- 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 929fb56eb..ed88558bb 100644 --- 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 8cba252b3..e4cfe6232 100644 --- 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: -- 2.39.5