From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Mar 2021 21:45:52 +0000 (-0500)
Subject: cephadm: blank line contains whitespace (W293)
X-Git-Tag: v16.2.0~106^2~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f33dac8de1ca8efe07b87f70c568bff2b860149f;p=ceph.git

cephadm: blank line contains whitespace (W293)

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

# Conflicts:
#	src/cephadm/cephadm
 whitespace
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index db23311a6b7c..e39138d8df3b 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3268,7 +3268,7 @@ def check_subnet(subnets: str) -> Tuple[int, List[int], str]:
         except ValueError as e:
             rc = 1
             errors.append(f"{subnet} invalid: {str(e)}")
-    
+
     return rc, list(versions), ", ".join(errors)
 
 
@@ -3367,7 +3367,7 @@ def prepare_mon_addresses(
         if not mon_network:
             raise Error('Failed to infer CIDR network for mon ip %s; pass '
                         '--skip-mon-network to configure it later' % base_ip)
-    
+
     return (addr_arg, ipv6, mon_network)
 
 
@@ -3792,7 +3792,7 @@ def finish_bootstrap_config(
     if mon_network:
         logger.info(f"Setting mon public_network to {mon_network}")
         cli(['config', 'set', 'mon', 'public_network', mon_network])
-    
+
     if cluster_network:
         logger.info(f"Setting cluster_network to {cluster_network}")
         cli(['config', 'set', 'global', 'cluster_network', cluster_network])
@@ -4208,7 +4208,7 @@ def command_deploy(ctx):
         if not daemon_ports:
             logger.info("cephadm-exporter will use default port ({})".format(CephadmDaemon.default_port))
             daemon_ports = [CephadmDaemon.default_port]
-           
+
         CephadmDaemon.validate_config(config_js)
 
         deploy_daemon(ctx, ctx.fsid, daemon_type, daemon_id, None,
@@ -6454,7 +6454,6 @@ class CephadmCache:
         self.host = {}
         self.lock = RLock()
 
-
     @property
     def health(self):
         return {
diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index e3365174d767..8650076998fb 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -6,7 +6,6 @@ skipsdist=true
 max-line-length = 100
 ignore =
     E501,
-    W293,
     W503,
     W504,
 exclude =