Merge pull request #42816 from sebastian-philipp/cephadm-upgrade-status-message

mgr/cephadm/upgrade: Upgrade status: We also upgrade non-ceph daemons

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
This commit is contained in:
Sebastian Wagner 2021-08-18 11:41:22 +02:00 committed by GitHub
commit 6462dc77ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -138,7 +138,7 @@ class CephadmUpgrade:
completed_types = list(set([completion[0] for completion in completed_daemons if all(
c[1] for c in completed_daemons if c[0] == completion[0])]))
return '%s/%s ceph daemons upgraded' % (done, len(daemons)), completed_types
return '%s/%s daemons upgraded' % (done, len(daemons)), completed_types
def _check_target_version(self, version: str) -> Optional[str]:
try: