From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 2 Feb 2016 12:35:09 +0000 (-0500)
Subject: [BZ-1282484] use the new utility when trying to stop a monitor
X-Git-Tag: v1.5.32~8^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6c020e96e181159452f616f934f7d78bc61deae7;p=ceph-deploy.git

[BZ-1282484] use the new utility when trying to stop a monitor

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

diff --git a/ceph_deploy/mon.py b/ceph_deploy/mon.py
index 0ade426..3781935 100644
--- a/ceph_deploy/mon.py
+++ b/ceph_deploy/mon.py
@@ -328,7 +328,7 @@ def destroy_mon(conn, cluster, hostname):
         )
 
         # stop
-        if conn.remote_module.path_exists(os.path.join(path, 'upstart')):
+        if conn.remote_module.path_exists(os.path.join(path, 'upstart')) or system.is_upstart(conn):
             status_args = [
                 'initctl',
                 'status',
@@ -351,7 +351,7 @@ def destroy_mon(conn, cluster, hostname):
                 'ceph-mon@{hostname}.service'.format(hostname=hostname),
             ]
         else:
-            raise RuntimeError('unsupported init system detected, cannot continue')
+            raise RuntimeError('could not detect a supported init system, cannot continue')
 
         while retries:
             conn.logger.info('polling the daemon to verify it stopped')