RGW: Add support for usage log configuration

Adds support for configuring the RadosGW usage log described at
http://docs.ceph.com/docs/jewel/man/8/radosgw/#usage-logging.

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index c3956abbbaefabc76311659a68e4893c158e3b89..c74d4aa12fa4b34629e3822cd68c3e8ce57c2696 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -309,6 +309,12 @@ dummy:
 #radosgw_keystone_revocation_internal: 900
 #radosgw_s3_auth_use_keystone: "true"
 #radosgw_nss_db_path: /var/lib/ceph/radosgw/ceph-radosgw.{{ ansible_hostname }}/nss
+# Settings for the RGW usage logging described at http://docs.ceph.com/docs/jewel/man/8/radosgw/#usage-logging
+#radosgw_usage_log: false
+#radosgw_usage_log_tick_interval: 30
+#radosgw_usage_log_flush_threshold: 1024
+#radosgw_usage_max_shards: 32
+#radosgw_usage_max_user_shards: 1
 # Rados Gateway options
 #email_address: foo@bar.com
 

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 036f3bf3d349d034c2764cd8ef73387960fda923..ea6e0047ff5a68d64f523c8d198ae36848b583d7 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -301,6 +301,12 @@ radosgw_keystone_token_cache_size: 10000
 radosgw_keystone_revocation_internal: 900
 radosgw_s3_auth_use_keystone: "true"
 radosgw_nss_db_path: /var/lib/ceph/radosgw/ceph-radosgw.{{ ansible_hostname }}/nss
+# Settings for the RGW usage logging described at http://docs.ceph.com/docs/jewel/man/8/radosgw/#usage-logging
+radosgw_usage_log: false
+radosgw_usage_log_tick_interval: 30
+radosgw_usage_log_flush_threshold: 1024
+radosgw_usage_max_shards: 32
+radosgw_usage_max_user_shards: 1
 # Rados Gateway options
 email_address: foo@bar.com
 

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index e278a672603ea61cabd62eaab5db79e20902e058..f28ceddd0af83879190a83360957b4e3feecc36f 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -131,6 +131,13 @@ rgw s3 auth use keystone = {{ radosgw_s3_auth_use_keystone }}
 nss db path = {{ radosgw_nss_db_path }}
 {% endif %}
 {% endif %}
+{% if radosgw_usage_log | bool %}
+rgw enable usage log = true
+rgw usage log tick interval = {{ radosgw_usage_log_tick_interval }}
+rgw usage log flush threshold = {{ radosgw_usage_log_flush_threshold }}
+rgw usage max shards = {{ radosgw_usage_max_shards }}
+rgw usage max user shards = {{ radosgw_usage_max_user_shards }}
+{% endif %}
 {% endif %}
 {% endfor %}
 {% endif %}