From: Michael Fritch Date: Thu, 28 Jan 2021 02:42:33 +0000 (-0700) Subject: mgr/cephadm: Trailing whitespace (W291) X-Git-Tag: v16.2.0~178^2~32 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc59b5da7c01485b87e8e54ff916f80bc0e33a55;p=ceph.git mgr/cephadm: Trailing whitespace (W291) Signed-off-by: Michael Fritch (cherry picked from commit 8e093a5993dac6ce77efb7fd9ada1671e249b475) --- diff --git a/src/pybind/mgr/cephadm/inventory.py b/src/pybind/mgr/cephadm/inventory.py index 5e2f81759ff..2074bb1462e 100644 --- a/src/pybind/mgr/cephadm/inventory.py +++ b/src/pybind/mgr/cephadm/inventory.py @@ -199,14 +199,14 @@ class HostCache(): 4. `last_etc_ceph_ceph_conf` O(hosts) - Stores the last refresh time for the /etc/ceph/ceph.conf. Used + Stores the last refresh time for the /etc/ceph/ceph.conf. Used to avoid deploying new configs when failing over to a new mgr. 5. `scheduled_daemon_actions`: O(daemons) Used to run daemon actions after deploying a daemon. We need to store it persistently, in order to stay consistent across - MGR failovers. + MGR failovers. """ def __init__(self, mgr): diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 9125905a675..9ac1297bad6 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -1333,7 +1333,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, Placing a host into maintenance disables the cluster's ceph target in systemd and stops all ceph daemons. If the host is an osd host we apply the noout flag - for the host subtree in crush to prevent data movement during a host maintenance + for the host subtree in crush to prevent data movement during a host maintenance window. :param hostname: (str) name of the host (must match an inventory hostname) @@ -1402,7 +1402,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, """Exit maintenance mode and return a host to an operational state Returning from maintnenance will enable the clusters systemd target and - start it, and remove any noout that has been added for the host if the + start it, and remove any noout that has been added for the host if the host has osd daemons :param hostname: (str) host name diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini index 038fcc42c81..995e8f92d0a 100644 --- a/src/pybind/mgr/tox.ini +++ b/src/pybind/mgr/tox.ini @@ -15,7 +15,6 @@ ignore = F401, F811, F841, - W291, W503, W504, exclude =