Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

quincy: cephadm: Fix repo_gpgkey should return 2 vars #47374

Merged
merged 2 commits into from
Aug 3, 2022
Merged

quincy: cephadm: Fix repo_gpgkey should return 2 vars #47374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5797d7b
cephadm: Fix repo_gpgkey should return 2 vars
ksperis Jul 28, 2022
960983b
cephadm: ceph.manual.gpg cleanup
ksperis Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cephadm/cephadm
View file
Open in desktop
Expand Up @@ -7401,7 +7401,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:
Expand Down Expand Up @@ -7465,7 +7465,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)
Expand Down