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

cephadm: trailing whitespace (W291)

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

# Conflicts:
#	src/cephadm/cephadm
  - whitespace

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 5299965b7e9f..db23311a6b7c 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -144,7 +144,7 @@ class CephadmContext:
         if "_conf" in self.__dict__ and hasattr(self._conf, name):
             return getattr(self._conf, name)
         elif "_args" in self.__dict__ and hasattr(self._args, name):
-            return getattr(self._args, name)        
+            return getattr(self._args, name)
         else:
             return super().__getattribute__(name)
 
@@ -3253,7 +3253,7 @@ def check_subnet(subnets: str) -> Tuple[int, List[int], str]:
     """
 
     rc = 0
-    versions = set() 
+    versions = set()
     errors = []
     subnet_list = subnets.split(',')
     for subnet in subnet_list:
@@ -3374,7 +3374,7 @@ def prepare_mon_addresses(
 def prepare_cluster_network(ctx: CephadmContext) -> Tuple[str, bool]:
     cluster_network = ""
     ipv6_cluster_network = False
-    # the cluster network may not exist on this node, so all we can do is 
+    # the cluster network may not exist on this node, so all we can do is
     # validate that the address given is valid ipv4 or ipv6 subnet
     if ctx.cluster_network:
         rc, versions, err_msg = check_subnet(ctx.cluster_network)
@@ -6454,6 +6454,7 @@ 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 db34721d1f89..e3365174d767 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -6,7 +6,6 @@ skipsdist=true
 max-line-length = 100
 ignore =
     E501,
-    W291,
     W293,
     W503,
     W504,