make /var/log/ceph writeable by non-root; make clients log to it

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template
index 202a245403e07e052b72810ca48be1f496e4a236..192b2313f1d165bcc4f6bf0f8bab814c84be20ec 100644 (file)
--- a/teuthology/ceph.conf.template
+++ b/teuthology/ceph.conf.template
@@ -30,3 +30,4 @@
         rgw cache enabled = true
        rgw enable ops log = true
        rgw enable usage log = true
+       log dir = /var/log/ceph/ceph.$name.$pid.log
\ No newline at end of file

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index c2eb06ac3018d42e2b8b9f6b29a024f25216c175..382d7b706c5d1f32cbc9d29f4a147fa6a154be95 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -80,6 +80,18 @@ class CephState(object):
 
 @contextlib.contextmanager
 def ceph_log(ctx, config):
+    log.info('Making ceph log dir writeable by non-root...')
+    run.wait(
+        ctx.cluster.run(
+            args=[
+                'sudo',
+                'chown',
+                '777',
+                '/var/log/ceph',
+                ],
+            wait=False,
+            )
+        )
     log.info('Creating extra log directories...')
     run.wait(
         ctx.cluster.run(