From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 30 May 2018 18:36:00 +0000 (-0400)
Subject: qa/workunits: remove ceph-detect-init from ceph-helpers-root.sh
X-Git-Tag: v14.0.1~1088^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0a3ddc6c3a94ef93261c08ee0894a7f9505ea2c;p=ceph.git

qa/workunits: remove ceph-detect-init from ceph-helpers-root.sh

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

diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh
index c54dbde7adb1..d4558bba196a 100755
--- a/qa/workunits/ceph-helpers-root.sh
+++ b/qa/workunits/ceph-helpers-root.sh
@@ -47,20 +47,8 @@ function control_osd() {
     local action=$1
     local id=$2
 
-    local init=$(ceph-detect-init)
+    sudo systemctl $action ceph-osd@$id
 
-    case $init in
-        upstart)
-            sudo service ceph-osd $action id=$id
-            ;;
-        systemd)
-            sudo systemctl $action ceph-osd@$id
-            ;;
-        *)
-            echo ceph-detect-init returned an unknown init system: $init >&2
-            return 1
-            ;;
-    esac
     return 0
 }