From: Carl Xiong <xiongc05@gmail.com>
Date: Fri, 22 Sep 2017 03:55:33 +0000 (+0800)
Subject: ceph-disk: fix '--runtime' omission for ceph-osd service
X-Git-Tag: v13.0.1~825^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17904%2Fhead;p=ceph.git

ceph-disk: fix '--runtime' omission for ceph-osd service

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>
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 5a0a2b61ecf5..0a27d43af73a 100644
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -3248,7 +3248,7 @@ def systemd_start(
     osd_id,
 ):
     systemd_disable(path, osd_id)
-    if is_mounted(path):
+    if os.path.ismount(path):
         style = ['--runtime']
     else:
         style = []