From: Travis Rhoden <trhoden@redhat.com>
Date: Fri, 22 May 2015 14:51:42 +0000 (-0400)
Subject: [RM-11694] Always write admin keyring with mode 0600
X-Git-Tag: v1.5.22.2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f898b4cf44abc1f7fe472b59e009e6ff44e441a7;p=ceph-deploy.git

[RM-11694] Always write admin keyring with mode 0600

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
(cherry picked from commit 8ef6d41e5bdbaf2717671c1ace237d35fa8ebcb4)
---

diff --git a/ceph_deploy/admin.py b/ceph_deploy/admin.py
index 6bea0dd..c3e5ba2 100644
--- a/ceph_deploy/admin.py
+++ b/ceph_deploy/admin.py
@@ -37,7 +37,8 @@ def admin(args):
 
             distro.conn.remote_module.write_file(
                 '/etc/ceph/%s.client.admin.keyring' % args.cluster,
-                keyring
+                keyring,
+                0600,
             )
 
             distro.conn.exit()