cephadm: use release/autobuild .asc instead of .gpg for repo_gpgkey

release.gpg no longer exists at download.ceph.com/keys/ (moved to
/keys/old/, last updated 2020-08-21). Only release.asc is current and
maintained. autobuild.gpg still resolves but is inconsistent with this
and could rot the same way.

repo_gpgkey() now returns the .asc URLs for both release and autobuild
keys. rpm --import and apt accept ASCII-armored keys directly, so no
other code changes are needed.

Fixes 404s seen in qa/workunits/cephadm/test_repos.sh and reported by
users running cephadm add-repo on current distros.

Fixes: https://tracker.ceph.com/issues/78179
Signed-off-by: Redouane Kachach <rkachach@ibm.com>

diff --git a/src/cephadm/cephadmlib/packagers.py b/src/cephadm/cephadmlib/packagers.py
index a353fbe79a08ddffcd7e0ce30906ed4697084719..bd91ff55d4aac6613e2ed8105bd431d9f7857c86 100644 (file)
--- a/src/cephadm/cephadmlib/packagers.py
+++ b/src/cephadm/cephadmlib/packagers.py
@@ -136,9 +136,9 @@ class Packager(object):
         if 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'
+            return 'https://download.ceph.com/keys/release.asc', 'release'
         else:
-            return 'https://download.ceph.com/keys/autobuild.gpg', 'autobuild'
+            return 'https://download.ceph.com/keys/autobuild.asc', 'autobuild'
 
 
 class Apt(Packager):