Merge pull request #38278 from votdev/fix_cephadm_typo

pybind/mgr/cephadm: Fix various typos

Reviewed-by: Sebastian Wagner <swagner@suse.com>
This commit is contained in:
Kefu Chai 2020-11-27 14:21:25 +08:00 committed by GitHub
commit bc4a8a55dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -370,7 +370,7 @@ class CephadmServe:
if self.mgr.warn_on_stray_daemons and daemon_detail:
self.mgr.health_checks['CEPHADM_STRAY_DAEMON'] = {
'severity': 'warning',
'summary': '%d stray daemons(s) not managed by cephadm' % (
'summary': '%d stray daemon(s) not managed by cephadm' % (
len(daemon_detail)),
'count': len(daemon_detail),
'detail': daemon_detail,

View File

@ -614,7 +614,7 @@ class RgwService(CephService):
def create_realm_zonegroup_zone(self, spec: RGWSpec, rgw_id: str) -> None:
if utils.get_cluster_health(self.mgr) != 'HEALTH_OK':
raise OrchestratorError('Health not ok, will try agin when health ok')
raise OrchestratorError('Health not ok, will try again when health ok')
# get keyring needed to run rados commands and strip out just the keyring
keyring = self.get_keyring(rgw_id).split('key = ', 1)[1].rstrip()

View File

@ -17,7 +17,7 @@ DEVICE_HEALTH_IN_USE = 'DEVICE_HEALTH_IN_USE'
DEVICE_HEALTH_TOOMANY = 'DEVICE_HEALTH_TOOMANY'
HEALTH_MESSAGES = {
DEVICE_HEALTH: '%d device(s) expected to fail soon',
DEVICE_HEALTH_IN_USE: '%d daemons(s) expected to fail soon and still contain data',
DEVICE_HEALTH_IN_USE: '%d daemon(s) expected to fail soon and still contain data',
DEVICE_HEALTH_TOOMANY: 'Too many daemons are expected to fail soon',
}