From: Michael Fritch <mfritch@suse.com>
Date: Wed, 20 Jan 2021 21:28:38 +0000 (-0700)
Subject: cephadm: remove redundant `ERROR` during check-host
X-Git-Tag: v16.2.0~119^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5874591a1679bb6873fe2317be6cd539bb14e1d;p=ceph.git

cephadm: remove redundant `ERROR` during check-host

```
ERROR: ERROR: No time synchronization is active
```

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit ace5d41dc580a1ea0d0aba19f07da355b06823ef)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 3da8ea0b72567..161e0fa760931 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -5277,21 +5277,21 @@ def command_check_host(ctx: CephadmContext) -> None:
             find_program(command)
             logger.info('%s is present' % command)
         except ValueError:
-            errors.append('ERROR: %s binary does not appear to be installed' % command)
+            errors.append('%s binary does not appear to be installed' % command)
 
     # check for configured+running chronyd or ntp
     if not check_time_sync(ctx):
-        errors.append('ERROR: No time synchronization is active')
+        errors.append('No time synchronization is active')
 
     if "expect_hostname" in ctx and ctx.expect_hostname:
         if get_hostname().lower() != ctx.expect_hostname.lower():
-            errors.append('ERROR: hostname "%s" does not match expected hostname "%s"' % (
+            errors.append('hostname "%s" does not match expected hostname "%s"' % (
                 get_hostname(), ctx.expect_hostname))
         logger.info('Hostname "%s" matches what is expected.',
                     ctx.expect_hostname)
 
     if errors:
-        raise Error('\n'.join(errors))
+        raise Error('\nERROR: '.join(errors))
 
     logger.info('Host looks OK')