From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 6 Mar 2017 19:03:25 +0000 (-0500)
Subject: [RM-17287] hosts: detect systemd before sysvinit in centos
X-Git-Tag: v1.5.38~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82de3c96d134d7822971ec41879d5b1b6af07d4b;p=ceph-deploy.git

[RM-17287] hosts: detect systemd before sysvinit in centos

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

diff --git a/ceph_deploy/hosts/centos/__init__.py b/ceph_deploy/hosts/centos/__init__.py
index 3c03fda..daeae4c 100644
--- a/ceph_deploy/hosts/centos/__init__.py
+++ b/ceph_deploy/hosts/centos/__init__.py
@@ -22,12 +22,12 @@ def choose_init(module):
     if module.normalized_release.int_major < 7:
         return 'sysvinit'
 
-    if not module.conn.remote_module.path_exists("/usr/lib/systemd/system/ceph.target"):
-        return 'sysvinit'
-
     if is_systemd(module.conn):
         return 'systemd'
 
+    if not module.conn.remote_module.path_exists("/usr/lib/systemd/system/ceph.target"):
+        return 'sysvinit'
+
     return 'systemd'
 
 def get_packager(module):