revert scripts/ceph-deploy

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>

diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py
index 2c7da8519903ef47fceab9dac0a11f03c89fc4b6..d3f5f7621d750264b52fbc58883e4ef10017ae8f 100644 (file)
--- a/ceph_deploy/cli.py
+++ b/ceph_deploy/cli.py
@@ -151,7 +151,7 @@ def _main(args=None, namespace=None):
 
 def main(args=None, namespace=None):
     try:
-        _main(args=None, namespace=None)
+        _main(args=args, namespace=namespace)
     finally:
         # This block is crucial to avoid having issues with
         # Python spitting non-sense thread exceptions. We have already

diff --git a/scripts/ceph-deploy b/scripts/ceph-deploy
index 5e2d1536aa548f27f35cc0e246f4f9253e030bf0..cc8dd621a09afdaa8ad04dee2086bdf6afaed7cf 100755 (executable)
--- a/scripts/ceph-deploy
+++ b/scripts/ceph-deploy
@@ -18,18 +18,4 @@ elif os.path.exists('/usr/lib/python2.6/site-packages/ceph_deploy'):
 from ceph_deploy.cli import main
 
 if __name__ == '__main__':
-    try:
-        sys.exit(main())
-    finally:
-        # This block is crucial to avoid having issues with
-        # Python spitting non-sense thread exceptions. We have already
-        # handled what we could, so close stderr and stdout.
-        if not os.environ.get('CEPH_DEPLOY_TEST'):
-            try:
-                sys.stdout.close()
-            except:
-                pass
-            try:
-                sys.stderr.close()
-            except:
-                pass
+    sys.exit(main())