From: Michael Fritch <mfritch@suse.com>
Date: Thu, 28 Jan 2021 20:16:04 +0000 (-0700)
Subject: mgr/cephadm: Line break occurred after a binary operator (W504)
X-Git-Tag: v16.2.0~178^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a69f8a80abc5a9eee169333f63f56108581ca6d;p=ceph.git

mgr/cephadm: Line break occurred after a binary operator (W504)

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 9ac1297bad65..418ad9f7818b 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -915,8 +915,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
                 return 1, '', ('check-host failed:\n' + '\n'.join(err))
         except OrchestratorError as e:
             self.log.exception(f"check-host failed for '{host}'")
-            return 1, '', ('check-host failed:\n' +
-                           f"Host '{host}' not found. Use 'ceph orch host ls' to see all managed hosts.")
+            return 1, '', ('check-host failed:\n'
+                           + f"Host '{host}' not found. Use 'ceph orch host ls' to see all managed hosts.")
         # if we have an outstanding health alert for this host, give the
         # serve thread a kick
         if 'CEPHADM_HOST_CHECK_FAILED' in self.health_checks:
@@ -1184,8 +1184,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
         """
         return [
             h for h in self.inventory.all_specs()
-            if self.cache.host_had_daemon_refresh(h.hostname) and
-            h.status.lower() not in ['maintenance', 'offline']
+            if self.cache.host_had_daemon_refresh(h.hostname)
+            and h.status.lower() not in ['maintenance', 'offline']
         ]
 
     def _add_host(self, spec):
@@ -1295,8 +1295,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
             return 1, '\n'.join(error_notifications)
 
         if notifications:
-            return 0, (f'It is presumed safe to stop host {hostname}. ' +
-                       'Note the following:\n\n' + '\n'.join(notifications))
+            return 0, (f'It is presumed safe to stop host {hostname}. '
+                       + 'Note the following:\n\n' + '\n'.join(notifications))
         return 0, f'It is presumed safe to stop host {hostname}'
 
     @trivial_completion
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 995e8f92d0a6..0cfc1d0cc038 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -16,7 +16,6 @@ ignore =
     F811,
     F841,
     W503,
-    W504,
 exclude =
     .tox,
     .vagrant,