rgy.py: make log_(data|metadata) configurable

The log_data and log_metadata are made configurable
via the YAML file and default to false
(meaning neither data nor metadata operations are
logged).

Signed-off-by: Joe Buck <jbbuck@gmail.com>

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 177e81167ba68b0c9540a02d15babd4e94ccfcef..63d05657625a6c155d6bcd52e97cf4aa0033c837 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -284,6 +284,13 @@ def extract_zone_info(ctx, client, client_config):
         if key in ceph_config:
             zone_info[key] = ceph_config[key]
 
+    # these keys are meant for the zones argument in the region info.
+    # We insert them into zone_info with a different format and then remove them
+    # in the fill_in_endpoints() method
+    for key in ['rgw log meta', 'rgw log data']:
+        if key in ceph_config:
+            zone_info[key] = ceph_config[key]
+
     return region, zone, zone_info
 
 def extract_region_info(region, region_info):