cherry-pick OSD activation fix

the ceph-osd@ID services should not be enabled persistently, as they get
enabled and started via UDEV/ceph.service -> ceph-disk.

diff --git a/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch b/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch
new file mode 100644 (file)
index 0000000..7720a8d
--- /dev/null
+++ b/patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch
@@ -0,0 +1,36 @@
+From 67f56c5d882c8e4bed3d404825da3454732ca32a Mon Sep 17 00:00:00 2001
+From: Carl Xiong <xiongc05@gmail.com>
+Date: Fri, 22 Sep 2017 11:55:33 +0800
+Subject: [PATCH 5/5] ceph-disk: fix '--runtime' omission for ceph-osd service
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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)
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ src/ceph-disk/ceph_disk/main.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
+index 8b0c5dbc38..6482ba7dee 100755
+--- 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 = []
+-- 
+2.14.1
+

diff --git a/patches/series b/patches/series
index 1be317a38670b5f228f7dbfa8f2f58932adb0a4c..cae4f2a2316b8446c79937a1cf7f7106a4c60416 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -2,3 +2,4 @@
 0002-cmake-disable-version-from-git.patch
 0003-enable-systemd-targets-by-default.patch
 0004-msg-async-rdma-uninitialized-variable-fix.patch
+0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch