From 949a748da71ca110fffb98f3be8bf24d3d0c828a Mon Sep 17 00:00:00 2001 From: Ryan Moe Date: Tue, 27 Aug 2013 23:21:01 +0000 Subject: [PATCH] Exit from ceph-deploy script with return value of main() Signed-off-by: Ryan Moe --- ceph_deploy/gatherkeys.py | 2 +- scripts/ceph-deploy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph_deploy/gatherkeys.py b/ceph_deploy/gatherkeys.py index 2261f3c..bb48eb0 100644 --- a/ceph_deploy/gatherkeys.py +++ b/ceph_deploy/gatherkeys.py @@ -43,7 +43,7 @@ def gatherkeys(args): ret = 1 # mon. - fetch_file( + r = fetch_file( args=args, frompath='/var/lib/ceph/mon/%s-{hostname}/keyring' % args.cluster, topath='{cluster}.mon.keyring'.format( diff --git a/scripts/ceph-deploy b/scripts/ceph-deploy index 828b1d8..cc8dd62 100755 --- a/scripts/ceph-deploy +++ b/scripts/ceph-deploy @@ -18,4 +18,4 @@ elif os.path.exists('/usr/lib/python2.6/site-packages/ceph_deploy'): from ceph_deploy.cli import main if __name__ == '__main__': - main() + sys.exit(main()) -- 2.47.3