Exit from ceph-deploy script with return value of main()

Signed-off-by: Ryan Moe <rmoe@mirantis.com>

diff --git a/ceph_deploy/gatherkeys.py b/ceph_deploy/gatherkeys.py
index 2261f3c4ef7dc189f981761e6edbe6f534d52697..bb48eb0e5dc17a2fe1bac9a2a3dbceef4adb8167 100644 (file)
--- 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 828b1d8d70e08fb860bcf7dfdf394c6a9b3a4fcb..cc8dd621a09afdaa8ad04dee2086bdf6afaed7cf 100755 (executable)
--- 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())