ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2f07b85131)
pull/5012/head
Dimitri Savineau 2020-01-28 10:27:34 -05:00 committed by Guillaume Abrioux
parent bc6777c6df
commit 3daea719b6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -532,7 +532,7 @@ dummy:
# instead of [client.radosgw.*]. # instead of [client.radosgw.*].
# For more examples check the profiles directory of https://github.com/ceph/ceph-ansible. # 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: # Example:
# ceph_conf_overrides: # ceph_conf_overrides:

2
group_vars/rhcs.yml.sample
View File

@ -532,7 +532,7 @@ ceph_iscsi_config_dev: false
# instead of [client.radosgw.*]. # instead of [client.radosgw.*].
# For more examples check the profiles directory of https://github.com/ceph/ceph-ansible. # 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: # Example:
# ceph_conf_overrides: # ceph_conf_overrides:

2
roles/ceph-defaults/defaults/main.yml
View File

@ -524,7 +524,7 @@ rgw_pull_proto: "http" # should be the same as rgw_multisite_proto for the maste
# instead of [client.radosgw.*]. # instead of [client.radosgw.*].
# For more examples check the profiles directory of https://github.com/ceph/ceph-ansible. # 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: # Example:
# ceph_conf_overrides: # ceph_conf_overrides: