From: Sage Weil <sage@inktank.com>
Date: Thu, 21 Feb 2013 21:13:51 +0000 (-0800)
Subject: ceph: fix log, /var/run/ceph stupid
X-Git-Tag: 1.1.0~2294
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=17be13b2b482082aee37b87216920d5252ca88e5;p=teuthology.git

ceph: fix log, /var/run/ceph stupid

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

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 3c69f502e7..efd0495448 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -79,19 +79,14 @@ class CephState(object):
 
 @contextlib.contextmanager
 def ceph_log(ctx, config):
-    log.info('Making ceph log and run dirs writeable by non-root...')
+    log.info('Making ceph log dir writeable by non-root...')
     run.wait(
         ctx.cluster.run(
             args=[
-                'sudo',
-                'install', '-d', '-m0755', '--',
-                '/var/run/ceph',
-                run.Raw(';'),
                 'sudo',
                 'chmod',
                 '777',
                 '/var/log/ceph',
-                '/var/run/ceph',
                 ],
             wait=False,
             )
@@ -255,7 +250,7 @@ def cluster(ctx, config):
         ctx.cluster.run(
             args=[
                 'sudo',
-                'install', '-d', '-m0755', '--', '/var/run/ceph',
+                'install', '-d', '-m0777', '--', '/var/run/ceph',
                 ],
             wait=False,
             )