Add new spindle_count node parameter

[ganeti-local] / lib / utils / nodesetup.py

diff --git a/lib/utils/nodesetup.py b/lib/utils/nodesetup.py
index e5d27ca..5dfc621 100644 (file)
--- a/lib/utils/nodesetup.py
+++ b/lib/utils/nodesetup.py
@@ -22,7 +22,6 @@
 
 """
 
-import os
 from cStringIO import StringIO
 
 from ganeti import constants
@@ -63,7 +62,8 @@ def SetEtcHostsEntry(file_name, ip, hostname, aliases):
       out.write(line)
   _write_entry(written)
 
-  io.WriteFile(file_name, data=out.getvalue(), mode=0644)
+  io.WriteFile(file_name, data=out.getvalue(), uid=0, gid=0, mode=0644,
+               keep_perms=io.KP_IF_EXISTS)
 
 
 def AddHostToEtcHosts(hostname, ip):
@@ -105,7 +105,8 @@ def RemoveEtcHostsEntry(file_name, hostname):
 
     out.write(line)
 
-  io.WriteFile(file_name, data=out.getvalue(), mode=0644)
+  io.WriteFile(file_name, data=out.getvalue(), uid=0, gid=0, mode=0644,
+               keep_perms=io.KP_IF_EXISTS)
 
 
 def RemoveHostFromEtcHosts(hostname):