From: Loic Dachary <loic@dachary.org>
Date: Mon, 30 Dec 2013 16:09:35 +0000 (+0100)
Subject: ceph-disk: remove noop try:
X-Git-Tag: v0.67.6~1^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27988cf9ffedf3289099e51f1e7c3f5b8d79d667;p=ceph.git

ceph-disk: remove noop try:

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit de0050596b5f56863c3486c1cd5e7ffea62e3d00)
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 8b9c5c62e931..4edf842af4a7 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1722,7 +1722,6 @@ def activate(
     init,
     ):
 
-    try:
         check_osd_magic(path)
 
         ceph_fsid = read_one_line(path, 'ceph_fsid')
@@ -1801,9 +1800,6 @@ def activate(
             write_one_line(path, 'active', 'ok')
         LOG.debug('%s osd.%s data dir is ready at %s', cluster, osd_id, path)
         return (osd_id, cluster)
-    except:
-        raise
-
 
 
 def main_activate(args):