From: Sébastien Han <seb@redhat.com>
Date: Wed, 29 Mar 2017 13:47:56 +0000 (+0200)
Subject: systemd: remove ceph-create-keys from presets
X-Git-Tag: v11.2.1~192^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b77d780c91f96ce9bb63fa1c09d507d02e555178;p=ceph.git

systemd: remove ceph-create-keys from presets

ceph-create-keys unit file was removed here:

* https://github.com/ceph/ceph/commit/8bcb4646b6b9846bb965cdec3ca2a21eb3b26bab
* https://github.com/ceph/ceph/commit/dc5fe8d415858358bd0baf5d8dce0a753f5e0cea

As a consequence the systemctl preset command now fails to run since the
unit does not exist anymore. Due to the redirection in /dev/null we
don't know what's happening.

Ultimately the mon unit doesn't get enabled and the mon service won't
start after reboot.
Removing the old/non-existent unit makes the command succeed now.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 151c0ce213186b2196531ce74478ed7671eb9819)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 5063ee43965..cad5864f40c 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1114,7 +1114,7 @@ fi
 %post mon
 %if 0%{?suse_version}
 if [ $1 -eq 1 ] ; then
-  /usr/bin/systemctl preset ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target >/dev/null 2>&1 || :
+  /usr/bin/systemctl preset ceph-mon@\*.service ceph-mon.target >/dev/null 2>&1 || :
 fi
 %endif
 %if 0%{?fedora} || 0%{?rhel}