Merge pull request #39153 from mgfritch/cephadm-flake8

mgr/cephadm: introduce flake8

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge

diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py
index 0ca15a1c78c76417bd0f72394d541399cdbc9627,a72a0e7d90867a8881c3aa690079370968cbaa64..95fc14f479d8710711bb0511ad67cbc0ab243942
--- 1/src/pybind/mgr/cephadm/services/cephadmservice.py
--- 2/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@@ -254,17 -242,11 +252,16 @@@ class CephadmService(metaclass=ABCMeta)
          def plural(count: int) -> str:
              return 'daemon' if count == 1 else 'daemons'
  
-         daemon_count = "only" if number_of_running_daemons == 1 else number_of_running_daemons
          left_count = "no" if num_daemons_left == 0 else num_daemons_left
  
 -        out = (f'WARNING: Stopping {len(daemon_ids)} out of {number_of_running_daemons} daemons in {service} service. '
 -               f'Service will not be operational with {left_count} {plural(num_daemons_left)} left. '
 -               f'At least {low_limit} {plural(low_limit)} must be running to guarantee service. ')
 +        if alert:
 +            out = (f'ALERT: Cannot stop {names} in {service} service. '
 +                   f'Not enough remaining {service} daemons. '
 +                   f'Please deploy at least {low_limit + 1} {service} daemons before stopping {names}. ')
 +        else:
 +            out = (f'WARNING: Stopping {len(daemon_ids)} out of {number_of_running_daemons} daemons in {service} service. '
 +                   f'Service will not be operational with {left_count} {plural(num_daemons_left)} left. '
 +                   f'At least {low_limit} {plural(low_limit)} must be running to guarantee service. ')
          return True, out
  
      def pre_remove(self, daemon: DaemonDescription) -> None:

diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge

diff --cc src/pybind/mgr/cephadm/tests/test_upgrade.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/_interface.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge

diff --cc src/pybind/mgr/tox.ini
Simple merge