mgr/cephadm: PEP8tify

Those files should generate fewer conflicts for now.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 17db7ba7dfb5ad617ec2b3f81a37c6fdc69f9222)

diff --git a/src/pybind/mgr/cephadm/migrations.py b/src/pybind/mgr/cephadm/migrations.py
index 55468d96a23538e89ef3395b07b0b9344d1cf4df..9e1612dc40e1e747fc95facd6d174aefe0a41e9d 100644 (file)
--- a/src/pybind/mgr/cephadm/migrations.py
+++ b/src/pybind/mgr/cephadm/migrations.py
@@ -46,7 +46,8 @@ class Migrations:
     def verify_no_migration(self):
         if self.is_migration_ongoing():
             # this is raised in module.serve()
-            raise OrchestratorError("cephadm migration still ongoing. Please wait, until the migration is complete.")
+            raise OrchestratorError(
+                "cephadm migration still ongoing. Please wait, until the migration is complete.")
 
     def migrate(self):
         if self.mgr.migration_current == 0:
@@ -102,7 +103,8 @@ class Migrations:
 
             old_hosts = {h.hostname: h for h in spec.placement.hosts}
             new_hosts = [
-                old_hosts[d.hostname] if d.hostname in old_hosts else HostPlacementSpec(hostname=d.hostname, network='', name='')
+                old_hosts[d.hostname] if d.hostname in old_hosts else HostPlacementSpec(
+                    hostname=d.hostname, network='', name='')
                 for d in existing_daemons
             ]
 

diff --git a/src/pybind/mgr/cephadm/remotes.py b/src/pybind/mgr/cephadm/remotes.py
index 1c480c105e30d58868fad0ae40a8135fa52af30e..d8cda4e9d9c946bec97ed2c527547aeba4a79101 100644 (file)
--- a/src/pybind/mgr/cephadm/remotes.py
+++ b/src/pybind/mgr/cephadm/remotes.py
@@ -14,6 +14,7 @@ PATH = [
     '/sbin',
 ]
 
+
 def choose_python():
     for e in PYTHONS:
         for b in PATH:
@@ -22,6 +23,7 @@ def choose_python():
                 return p
     return None
 
+
 if __name__ == '__channelexec__':
     for item in channel:  # type: ignore
         channel.send(eval(item))  # type: ignore

diff --git a/src/pybind/mgr/cephadm/services/iscsi.py b/src/pybind/mgr/cephadm/services/iscsi.py
index 86ec539cb5f55bbb6cbb5711116dee0b4d7abddc..aecf1417835943cc302ccc0b6ad27c0d1361cddd 100644 (file)
--- a/src/pybind/mgr/cephadm/services/iscsi.py
+++ b/src/pybind/mgr/cephadm/services/iscsi.py
@@ -72,7 +72,6 @@ class IscsiService(CephadmService):
 
         return self.mgr._create_daemon(daemon_spec)
 
-
     def config_dashboard(self, daemon_descrs: List[DaemonDescription]):
         def get_set_cmd_dicts(out: str) -> List[dict]:
             gateways = json.loads(out)['gateways']

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index ed751ec4ec0a8a8d2357c9bc53143beac70af172..354529885600570656f2b6c26eb920c5f1550222 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -62,9 +62,9 @@ class NFSService(CephadmService):
         # generate the cephadm config
         cephadm_config = nfs.get_cephadm_config()
         cephadm_config.update(
-                self.mgr._get_config_and_keyring(
-                    daemon_type, daemon_id,
-                    keyring=keyring))
+            self.mgr._get_config_and_keyring(
+                daemon_type, daemon_id,
+                keyring=keyring))
 
         return cephadm_config, deps
 
@@ -89,7 +89,7 @@ class NFSService(CephadmService):
         return self.mgr._create_daemon(daemon_spec)
 
     def config_dashboard(self, daemon_descrs: List[DaemonDescription]):
-        
+
         def get_set_cmd_dicts(out: str) -> List[dict]:
             locations: Set[str] = set()
             for dd in daemon_descrs:
@@ -147,17 +147,17 @@ class NFSGanesha(object):
 
         if ret != 0:
             raise OrchestratorError(
-                    'Unable to create keyring %s: %s %s' \
-                            % (entity, ret, err))
+                'Unable to create keyring %s: %s %s'
+                % (entity, ret, err))
         return keyring
 
     def update_keyring_caps(self, entity: Optional[str] = None) -> None:
         if not entity:
             entity = self.get_keyring_entity()
 
-        osd_caps='allow rw pool=%s' % (self.spec.pool)
+        osd_caps = 'allow rw pool=%s' % (self.spec.pool)
         if self.spec.namespace:
-            osd_caps='%s namespace=%s' % (osd_caps, self.spec.namespace)
+            osd_caps = '%s namespace=%s' % (osd_caps, self.spec.namespace)
 
         logger.info('Updating keyring caps: %s' % entity)
         ret, out, err = self.mgr.mon_command({
@@ -169,8 +169,8 @@ class NFSGanesha(object):
 
         if ret != 0:
             raise OrchestratorError(
-                    'Unable to update keyring caps %s: %s %s' \
-                            % (entity, ret, err))
+                'Unable to update keyring caps %s: %s %s'
+                % (entity, ret, err))
 
     def create_rados_config_obj(self, clobber: Optional[bool] = False) -> None:
         obj = self.spec.rados_config_name()
@@ -202,13 +202,13 @@ class NFSGanesha(object):
         return self.mgr.template.render('services/nfs/ganesha.conf.j2', context)
 
     def get_cephadm_config(self) -> Dict[str, Any]:
-        config = {'pool' : self.spec.pool} # type: Dict
+        config = {'pool': self.spec.pool}  # type: Dict
         if self.spec.namespace:
             config['namespace'] = self.spec.namespace
         config['userid'] = self.get_rados_user()
         config['extra_args'] = ['-N', 'NIV_EVENT']
         config['files'] = {
-            'ganesha.conf' : self.get_ganesha_conf(),
+            'ganesha.conf': self.get_ganesha_conf(),
         }
         logger.debug('Generated cephadm config-json: %s' % config)
         return config