ceph-disk: CentOS 7 is systemd

http://tracker.ceph.com/issues/12786 Fixes: #12786

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/src/ceph-detect-init/ceph_detect_init/centos/__init__.py b/src/ceph-detect-init/ceph_detect_init/centos/__init__.py
index f7bf85beda8c4b2ac96224b91867b56f67e241a0..b9738a73b398aa359809e6f8f78328b2153190b1 100644 (file)
--- a/src/ceph-detect-init/ceph_detect_init/centos/__init__.py
+++ b/src/ceph-detect-init/ceph_detect_init/centos/__init__.py
@@ -8,4 +8,6 @@ def choose_init():
 
     Returns the name of a init system (upstart, sysvinit ...).
     """
+    if release and int(release.split('.')[0]) >= 7:
+        return 'systemd'
     return 'sysvinit'

diff --git a/src/ceph-detect-init/tests/test_all.py b/src/ceph-detect-init/tests/test_all.py
index 68189bf0187b8be29350e98eadeac49302ba13a2..72aa9e96f210c08fb8ffb4dd447d6264c2fd0f21 100644 (file)
--- a/src/ceph-detect-init/tests/test_all.py
+++ b/src/ceph-detect-init/tests/test_all.py
@@ -38,6 +38,9 @@ logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s',
 class TestCephDetectInit(testtools.TestCase):
 
     def test_centos(self):
+        with mock.patch('ceph_detect_init.centos.release',
+                        '7.0'):
+            self.assertEqual('systemd', centos.choose_init())
         self.assertEqual('sysvinit', centos.choose_init())
 
     def test_debian(self):