From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 4 Feb 2016 19:38:44 +0000 (-0500)
Subject: [RM-14646] check for upstart before checking for systemd
X-Git-Tag: v1.5.32~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F386%2Fhead;p=ceph-deploy.git

[RM-14646] check for upstart before checking for systemd

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph_deploy/hosts/debian/__init__.py b/ceph_deploy/hosts/debian/__init__.py
index 91b729f..e769c92 100644
--- a/ceph_deploy/hosts/debian/__init__.py
+++ b/ceph_deploy/hosts/debian/__init__.py
@@ -18,13 +18,16 @@ def choose_init(module):
 
     Returns the name of a init system (upstart, sysvinit ...).
     """
+    # Upstart checks first because when installing ceph, the
+    # `/lib/systemd/system/ceph.target` file may be created, fooling this
+    # detection mechanism.
+    if is_upstart(module.conn):
+        return 'upstart'
+
     if is_systemd(module.conn) or module.conn.remote_module.path_exists(
             "/lib/systemd/system/ceph.target"):
         return 'systemd'
 
-    if is_upstart(module.conn):
-        return 'upstart'
-
     return 'sysvinit'