From: Laurent Barbe <laurent@ksperis.com>
Date: Fri, 29 Jul 2022 07:33:36 +0000 (+0200)
Subject: cephadm: ceph.manual.gpg cleanup
X-Git-Tag: v16.2.11~411^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F47376%2Fhead;p=ceph.git

cephadm: ceph.manual.gpg cleanup

Cleanup file /etc/apt/trusted.gpg.d/ceph.manual.gpg when repo is removed

Signed-off-by: Laurent Barbe <laurent@ksperis.com>
(cherry picked from commit bf0951353a80dc17edcc85a7914cfaf2b956d544)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8875d946c8e5..e202f15067bf 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -6648,7 +6648,7 @@ class Apt(Packager):
         self.update()
 
     def rm_repo(self) -> None:
-        for name in ['autobuild', 'release']:
+        for name in ['autobuild', 'release', 'manual']:
             p = '/etc/apt/trusted.gpg.d/ceph.%s.gpg' % name
             if os.path.exists(p):
                 logger.info('Removing repo GPG key %s...' % p)