]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Fix repo_gpgkey should return 2 vars
authorLaurent Barbe <laurent@ksperis.com>
Thu, 28 Jul 2022 07:30:59 +0000 (09:30 +0200)
committerLaurent Barbe <laurent@ksperis.com>
Thu, 28 Jul 2022 15:38:44 +0000 (17:38 +0200)
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>
src/cephadm/cephadm

index 3023337fd7e7667fc104b5295df1bf66b946c28a..47ad6bdbbb288e7196504ada8936dcb69ed86faa 100755 (executable)
@@ -7394,7 +7394,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: