]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-daemon: drop unneeded `mode` during tmpfile create
authorMichael Fritch <mfritch@suse.com>
Mon, 2 Dec 2019 23:07:13 +0000 (16:07 -0700)
committerMichael Fritch <mfritch@suse.com>
Mon, 2 Dec 2019 23:59:05 +0000 (16:59 -0700)
Signed-off-by: Michael Fritch <mfritch@suse.com>
src/ceph-daemon/ceph-daemon

index f0c89bb5771202bb6bbc2ab128d620fb74098463..9164fe388383f541dac47f1f6db486163ec1c709 100755 (executable)
@@ -240,10 +240,9 @@ def infer_fsid(func):
         return func()
     return _infer_fsid
 
-def write_tmp(s, uid, gid, mode=0o600):
+def write_tmp(s, uid, gid):
     tmp_f = tempfile.NamedTemporaryFile(mode='w',
                                         prefix='ceph-tmp')
-    os.fchmod(tmp_f.fileno(), mode)
     os.fchown(tmp_f.fileno(), uid, gid)
     tmp_f.write(s)
     tmp_f.flush()
@@ -1013,7 +1012,7 @@ def command_bootstrap():
 
     # create initial monmap, tmp monmap file
     logger.info('Creating initial monmap...')
-    tmp_monmap = write_tmp('', uid, gid, mode=0o644)
+    tmp_monmap = write_tmp('', uid, gid)
     out = CephContainer(
         image=args.image,
         entrypoint='/usr/bin/monmaptool',