]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: fix '--runtime' omission for ceph-osd service 17942/head
authorCarl Xiong <xiongc05@gmail.com>
Fri, 22 Sep 2017 03:55:33 +0000 (11:55 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 25 Sep 2017 13:47:57 +0000 (15:47 +0200)
f425a127b introduces a regression that ceph-disk omits "--runtime" when
enabling ceph-osd@$ID.service units for device-backed OSDs.

Fixes: http://tracker.ceph.com/issues/21498
Signed-off-by: Carl Xiong <cxiong@suse.com>
(cherry picked from commit a385b5b0c35106c9b44d81655983b2f7566b21cd)

src/ceph-disk/ceph_disk/main.py

index 3c531c64ee10a69d4459607f04793f872f9d441f..b0d7722e43a227c04705091ad0ab1a837983bc26 100755 (executable)
@@ -2972,7 +2972,7 @@ def systemd_start(
     osd_id,
 ):
     systemd_disable(path, osd_id)
-    if is_mounted(path):
+    if os.path.ismount(path):
         style = ['--runtime']
     else:
         style = []