Clarify RGWs configuration when using ceph_conf_overrides.

To avoid future misconfigurations, clarify that the only valid
scheme is [client.rgw.*] instead of [client.radosgw.*].

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index e4d59daa8c53b3d15cd731c265633065695fb5d8..cc64812160309f96fafecb88a9d8630b1f676b8c 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -500,6 +500,11 @@ dummy:
 # Ceph configuration file override.
 # This allows you to specify more configuration options
 # using an INI style format.
+#
+# 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], [rgw]
 #
 # Example:
@@ -507,6 +512,8 @@ dummy:
 #   global:
 #     foo: 1234
 #     bar: 5678
+#   "client.rgw.{{ hostvars[groups.get(rgw_group_name)[0]]['ansible_hostname'] }}":
+#     rgw_zone: zone1
 #
 #ceph_conf_overrides: {}
 

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 989696a7929cd25be461ad2917b135ea09cdadab..5a6f172854721b49bf0b56b8f302d178aef87dac 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -500,6 +500,11 @@ ceph_rhcs_version: 3
 # Ceph configuration file override.
 # This allows you to specify more configuration options
 # using an INI style format.
+#
+# 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], [rgw]
 #
 # Example:
@@ -507,6 +512,8 @@ ceph_rhcs_version: 3
 #   global:
 #     foo: 1234
 #     bar: 5678
+#   "client.rgw.{{ hostvars[groups.get(rgw_group_name)[0]]['ansible_hostname'] }}":
+#     rgw_zone: zone1
 #
 #ceph_conf_overrides: {}
 

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index d1b4ef2f7fd4d927c3af6446bc6f7af539dd7650..0de35990b0af58b89da7f1f866b73063d7245de1 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -492,6 +492,11 @@ rgw_pull_proto: "http"
 # Ceph configuration file override.
 # This allows you to specify more configuration options
 # using an INI style format.
+#
+# 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], [rgw]
 #
 # Example:
@@ -499,6 +504,8 @@ rgw_pull_proto: "http"
 #   global:
 #     foo: 1234
 #     bar: 5678
+#   "client.rgw.{{ hostvars[groups.get(rgw_group_name)[0]]['ansible_hostname'] }}":
+#     rgw_zone: zone1
 #
 ceph_conf_overrides: {}