From: Sage Weil <sage@redhat.com>
Date: Wed, 30 Oct 2019 19:09:36 +0000 (-0500)
Subject: ceph-daemon: no extra newline needed in authorized_keys file
X-Git-Tag: v15.1.0~1098^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31270%2Fhead;p=ceph.git

ceph-daemon: no extra newline needed in authorized_keys file

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon b/src/ceph-daemon
index a2ed360964ca..a5c708e96558 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -1064,7 +1064,7 @@ def command_bootstrap():
         logger.info('Adding key to root@localhost\'s authorized_keys...')
         with open('/root/.ssh/authorized_keys', 'a') as f:
             os.fchmod(f.fileno(), 0o600)  # just in case we created it
-            f.write(ssh_pub + '\n')
+            f.write(ssh_pub.strip() + '\n')
 
         logger.info('Enabling ssh module...')
         CephContainer(