From: Laurent Barbe <laurent@ksperis.com>
Date: Thu, 28 Jul 2022 07:30:59 +0000 (+0200)
Subject: cephadm: Fix repo_gpgkey should return 2 vars
X-Git-Tag: v16.2.11~411^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38c73f544405f56f2524aabd233cf33b6b087019;p=ceph.git

cephadm: Fix repo_gpgkey should return 2 vars

when option --gpg-url is specified, the name used for the gpg filename is missing and throws an exception
this adds the string "manual" to the gpg key : /etc/apt/trusted.gpg.d/ceph.manual.gpg

Fixes: https://tracker.ceph.com/issues/56950

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 746ab8feebc..8875d946c8e 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -6584,7 +6584,7 @@ class Packager(object):
 
     def repo_gpgkey(self) -> Tuple[str, str]:
         if self.ctx.gpg_url:
-            return self.ctx.gpg_url
+            return self.ctx.gpg_url, 'manual'
         if self.stable or self.version:
             return 'https://download.ceph.com/keys/release.gpg', 'release'
         else: