From: Michael Fritch <mfritch@suse.com>
Date: Thu, 10 Mar 2022 17:18:51 +0000 (-0700)
Subject: cephadm: preserve `authorized_keys` file during upgrade
X-Git-Tag: v15.2.17~42^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7278ecd22dd3d5ee3adf0812421d31911d05cbe;p=ceph.git

cephadm: preserve `authorized_keys` file during upgrade

Fixes: https://tracker.ceph.com/issues/54530
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 781be8d44a8543aca87bba4f61ba47acc6046b49)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index cece4e90120..8ac2681fadb 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1462,7 +1462,7 @@ exit 0
 %{_mandir}/man8/cephadm.8*
 %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
 %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
-%attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
+%config(noreplace) %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
 
 %files common
 %dir %{_docdir}/ceph