From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Mon, 18 Nov 2013 11:08:15 +0000 (+0100)
Subject: use shutil.move instead of os.rename
X-Git-Tag: v1.3.3~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F134%2Fhead;p=ceph-deploy.git

use shutil.move instead of os.rename
---

diff --git a/ceph_deploy/hosts/remotes.py b/ceph_deploy/hosts/remotes.py
index 62766f7..40962e0 100644
--- a/ceph_deploy/hosts/remotes.py
+++ b/ceph_deploy/hosts/remotes.py
@@ -66,7 +66,7 @@ def write_keyring(path, key):
     """ create a keyring file """
     tmp_file = tempfile.NamedTemporaryFile(delete=False)
     tmp_file.write(key)
-    os.rename(tmp_file.name, path)
+    shutil.move(tmp_file.name, path)
 
 
 def create_mon_path(path):
@@ -150,7 +150,7 @@ def make_mon_removed_dir(path, file_name):
     except OSError, e:
         if e.errno != errno.EEXIST:
             raise
-    os.rename(path, os.path.join('/var/lib/ceph/mon-removed/', file_name))
+    shutil.move(path, os.path.join('/var/lib/ceph/mon-removed/', file_name))
 
 
 def safe_mkdir(path):