From: Michael Fritch <mfritch@suse.com>
Date: Fri, 12 Feb 2021 16:09:47 +0000 (-0700)
Subject: cephadm: continuation line missing indentation or outdented (E122)
X-Git-Tag: v16.2.0~106^2~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b71877715b2093202c3711b91e418988de42f48e;p=ceph.git

cephadm: continuation line missing indentation or outdented (E122)

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 105725b3003a..360c8fbba4ce 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2979,15 +2979,13 @@ StartLimitBurst=5
 {extra_args}
 [Install]
 WantedBy=ceph-{fsid}.target
-""".format(
-    container_path=ctx.container_path,
-    fsid=fsid,
-    data_dir=ctx.data_dir,
-    extra_args=extra_args,
-    # if docker, we depend on docker.service
-    docker_after=' docker.service' if docker else '',
-    docker_requires='Requires=docker.service\n' if docker else '',
-)
+""".format(container_path=ctx.container_path,
+           fsid=fsid,
+           data_dir=ctx.data_dir,
+           extra_args=extra_args,
+           # if docker, we depend on docker.service
+           docker_after=' docker.service' if docker else '',
+           docker_requires='Requires=docker.service\n' if docker else '')
 
     return u
 
@@ -4887,7 +4885,7 @@ def command_adopt_ceph(ctx, daemon_type, daemon_id, fsid):
     if not os.path.exists(data_dir_src):
         raise Error("{}.{} data directory '{}' does not exist.  "
                     "Incorrect ID specified, or daemon alrady adopted?".format(
-                    daemon_type, daemon_id, data_dir_src))
+                        daemon_type, daemon_id, data_dir_src))
 
     osd_fsid = None
     if daemon_type == 'osd':
@@ -7007,13 +7005,11 @@ RestartSec=10s
 
 [Install]
 WantedBy=ceph-{fsid}.target
-""".format(
-        fsid=self.fsid,
-        daemon_path=self.daemon_path,
-        # if docker, we depend on docker.service
-        docker_after=' docker.service' if docker else '',
-        docker_requires='Requires=docker.service\n' if docker else '',
-        )
+""".format(fsid=self.fsid,
+           daemon_path=self.daemon_path,
+           # if docker, we depend on docker.service
+           docker_after=' docker.service' if docker else '',
+           docker_requires='Requires=docker.service\n' if docker else '')
 
     def deploy_daemon_unit(self, config=None):
         """deploy a specific unit file for cephadm
diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 18f4c2816770..5299317cc746 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -5,7 +5,6 @@ skipsdist=true
 [flake8]
 max-line-length = 100
 ignore =
-    E122,
     E123,
     E124,
     E125,