From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 1 Feb 2016 11:26:05 +0000 (+0700)
Subject: tests: ceph-disk tests pid files must exist
X-Git-Tag: v10.0.4~46^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36656c8dc98deb8da10f3300bd627d31c785f865;p=ceph.git

tests: ceph-disk tests pid files must exist

http://tracker.ceph.com/issues/13422 made it so ceph-osd won't start
unless the pidfile can be created successfully. The default location
being the current directory, ceph-osd must explicitly be told to write
in a directory where it has write permissions.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py
index 76c99a4187ea..0ab5de2a08ac 100644
--- a/qa/workunits/ceph-disk/ceph-disk-test.py
+++ b/qa/workunits/ceph-disk/ceph-disk-test.py
@@ -209,6 +209,7 @@ class TestCephDisk(object):
         c = CephDisk()
         if c.sh("lsb_release -si").strip() == 'CentOS':
             c.helper("install multipath-tools device-mapper-multipath")
+        c.conf['global']['pid file'] = '/var/run/ceph/$cluster-$name.pid'
         #
         # objecstore
         #