patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch

   1 From 1f438fee7b3b7ffb589ae7af942fca836521117d Mon Sep 17 00:00:00 2001
   2 From: Carl Xiong <xiongc05@gmail.com>
   3 Date: Fri, 22 Sep 2017 11:55:33 +0800
   4 Subject: [PATCH 5/6] ceph-disk: fix '--runtime' omission for ceph-osd service
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 f425a127b introduces a regression that ceph-disk omits "--runtime" when
  10 enabling ceph-osd@$ID.service units for device-backed OSDs.
  11
  12 Fixes: http://tracker.ceph.com/issues/21498
  13
  14 Signed-off-by: Carl Xiong <cxiong@suse.com>
  15 (cherry picked from commit a385b5b0c35106c9b44d81655983b2f7566b21cd)
  16 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  17 ---
  18  src/ceph-disk/ceph_disk/main.py | 2 +-
  19  1 file changed, 1 insertion(+), 1 deletion(-)
  20
  21 diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
  22 index 8b0c5dbc38..6482ba7dee 100755
  23 --- a/src/ceph-disk/ceph_disk/main.py
  24 +++ b/src/ceph-disk/ceph_disk/main.py
  25 @@ -3248,7 +3248,7 @@ def systemd_start(
  26      osd_id,
  27  ):
  28      systemd_disable(path, osd_id)
  29 -    if is_mounted(path):
  30 +    if os.path.ismount(path):
  31          style = ['--runtime']
  32      else:
  33          style = []
  34 --
  35 2.14.1
  36