From: Dongmao Zhang Date: Wed, 8 Oct 2014 08:38:40 +0000 (+0800) Subject: Put distro.conn.exit to the end of function X-Git-Tag: v1.5.18~5^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9b7f5d5ec8a8c9feb184af70712d74cd14ab629;p=ceph-deploy.git Put distro.conn.exit to the end of function system.enable_service(distro.conn) is still needing the connection. Signed-off-by: Dongmao Zhang --- diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py index 2d338eb..9b4c3cb 100644 --- a/ceph_deploy/osd.py +++ b/ceph_deploy/osd.py @@ -381,11 +381,12 @@ def activate(args, cfg): # give the OSD a few seconds to start time.sleep(5) catch_osd_errors(distro.conn, distro.conn.logger, args) - distro.conn.exit() if distro.is_el: system.enable_service(distro.conn) + distro.conn.exit() + def disk_zap(args):