cephadm: at least two spaces before inline comment (E261)

Signed-off-by: Michael Fritch <mfritch@suse.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 5fe808b5a9582423474b862713a3e8a18744ced7..b7b833c72290bc71215821af8c3336df718d954b 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -96,7 +96,7 @@ cached_stdin = None
 DATEFMT = '%Y-%m-%dT%H:%M:%S.%fZ'
 
 
-logger: logging.Logger = None # type: ignore
+logger: logging.Logger = None  # type: ignore
 
 ##################################
 
@@ -921,7 +921,7 @@ def dict_get(d: Dict, key: str, default: Any = None, require: bool = False) -> A
     """
     if require and key not in d.keys():
         raise Error('{} missing from dict'.format(key))
-    return d.get(key, default) # type: ignore
+    return d.get(key, default)  # type: ignore
 
 ##################################
 
@@ -1819,7 +1819,7 @@ def copy_tree(ctx, src, dst, uid=None, gid=None):
 
         logger.debug('copy directory \'%s\' -> \'%s\'' % (src_dir, dst_dir))
         shutil.rmtree(dst_dir, ignore_errors=True)
-        shutil.copytree(src_dir, dst_dir) # dirs_exist_ok needs python 3.8
+        shutil.copytree(src_dir, dst_dir)  # dirs_exist_ok needs python 3.8
 
         for dirpath, dirnames, filenames in os.walk(dst_dir):
             logger.debug('chown %s:%s \'%s\'' % (uid, gid, dirpath))
@@ -3236,7 +3236,7 @@ def get_image_info_from_inspect(out, image):
         raise Error('inspect {}: empty result'.format(image))
     r = {
         'image_id': normalize_container_id(image_id)
-    } # type: Dict[str, Union[str,List[str]]]
+    }  # type: Dict[str, Union[str,List[str]]]
     if digests:
         r['repo_digests'] = digests[1:-1].split(' ')
     return r
@@ -3391,7 +3391,7 @@ def create_initial_keys(
     ctx: CephadmContext,
     uid: int, gid: int,
     mgr_id: str
-) -> Tuple[str, str, str, Any, Any]: # type: ignore
+) -> Tuple[str, str, str, Any, Any]:  # type: ignore
 
     _image = ctx.image
 
@@ -3539,7 +3539,7 @@ def wait_for_mon(
     # wait for the service to become available
     def is_mon_available():
         # type: () -> bool
-        timeout = ctx.timeout if ctx.timeout else 60 # seconds
+        timeout = ctx.timeout if ctx.timeout else 60  # seconds
         out, err, ret = call(ctx, c.run_cmd(),
                              desc=c.entrypoint,
                              timeout=timeout)
@@ -3566,7 +3566,7 @@ def create_mgr(
     logger.info('Waiting for mgr to start...')
     def is_mgr_available():
         # type: () -> bool
-        timeout = ctx.timeout if ctx.timeout else 60 # seconds
+        timeout = ctx.timeout if ctx.timeout else 60  # seconds
         try:
             out = clifunc(['status', '-f', 'json-pretty'], timeout=timeout)
             j = json.loads(out)
@@ -3634,12 +3634,12 @@ def prepare_ssh(
             with open(auth_keys_file, 'r') as f:
                 f.seek(0, os.SEEK_END)
                 if f.tell() > 0:
-                    f.seek(f.tell() - 1, os.SEEK_SET) # go to last char
+                    f.seek(f.tell() - 1, os.SEEK_SET)  # go to last char
                     if f.read() != '\n':
                         add_newline = True
 
         with open(auth_keys_file, 'a') as f:
-            os.fchown(f.fileno(), ssh_uid, ssh_gid) # just in case we created it
+            os.fchown(f.fileno(), ssh_uid, ssh_gid)  # just in case we created it
             os.fchmod(f.fileno(), 0o600)  # just in case we created it
             if add_newline:
                 f.write('\n')
@@ -4098,7 +4098,7 @@ def command_deploy(ctx):
         logger.info('%s daemon %s ...' % ('Deploy', ctx.name))
 
     # Get and check ports explicitly required to be opened
-    daemon_ports = [] # type: List[int]
+    daemon_ports = []  # type: List[int]
 
     # only check port in use if not reconfig or redeploy since service
     # we are redeploying/reconfiguring will already be using the port
@@ -4126,7 +4126,7 @@ def command_deploy(ctx):
             daemon_ports.extend(Monitoring.port_map[daemon_type])
 
         # make sure provided config-json is sufficient
-        config = get_parm(ctx.config_json) # type: ignore
+        config = get_parm(ctx.config_json)  # type: ignore
         required_files = Monitoring.components[daemon_type].get('config-json-files', list())
         required_args = Monitoring.components[daemon_type].get('config-json-args', list())
         if required_files:
@@ -4252,7 +4252,7 @@ def command_shell(ctx):
     if not ctx.keyring and os.path.exists(SHELL_DEFAULT_KEYRING):
         ctx.keyring = SHELL_DEFAULT_KEYRING
 
-    container_args = [] # type: List[str]
+    container_args = []  # type: List[str]
     mounts = get_container_mounts(ctx, ctx.fsid, daemon_type, daemon_id,
                                   no_config=True if ctx.config else False)
     binds = get_container_binds(ctx, ctx.fsid, daemon_type, daemon_id)
@@ -4314,7 +4314,7 @@ def command_enter(ctx):
     if not ctx.fsid:
         raise Error('must pass --fsid to specify cluster')
     (daemon_type, daemon_id) = ctx.name.split('.', 1)
-    container_args = [] # type: List[str]
+    container_args = []  # type: List[str]
     if ctx.command:
         command = ctx.command
     else:
@@ -4347,7 +4347,7 @@ def command_ceph_volume(ctx):
         l = FileLock(ctx, ctx.fsid)
         l.acquire()
 
-    (uid, gid) = (0, 0) # ceph-volume runs as root
+    (uid, gid) = (0, 0)  # ceph-volume runs as root
     mounts = get_container_mounts(ctx, ctx.fsid, 'osd', None)
 
     tmp_config = None
@@ -4417,7 +4417,7 @@ def command_logs(ctx):
     # call this directly, without our wrapper, so that we get an unmolested
     # stdout with logger prefixing.
     logger.debug("Running command: %s" % ' '.join(cmd))
-    subprocess.call(cmd) # type: ignore
+    subprocess.call(cmd)  # type: ignore
 
 ##################################
 
@@ -4701,7 +4701,7 @@ def list_daemons(ctx, detail=True, legacy_dir=None):
                                 else:
                                     logger.warning('version for unknown daemon type %s' % daemon_type)
                         else:
-                            vfile = os.path.join(data_dir, fsid, j, 'unit.image') # type: ignore
+                            vfile = os.path.join(data_dir, fsid, j, 'unit.image')  # type: ignore
                             try:
                                 with open(vfile, 'r') as f:
                                     image_name = f.read().strip() or None
@@ -4709,7 +4709,7 @@ def list_daemons(ctx, detail=True, legacy_dir=None):
                                 pass
 
                         # unit.meta?
-                        mfile = os.path.join(data_dir, fsid, j, 'unit.meta') # type: ignore
+                        mfile = os.path.join(data_dir, fsid, j, 'unit.meta')  # type: ignore
                         try:
                             with open(mfile, 'r') as f:
                                 meta = json.loads(f.read())
@@ -5251,9 +5251,9 @@ def check_time_sync(ctx, enabler=None):
     # type: (CephadmContext, Optional[Packager]) -> bool
     units = [
         'chrony.service',  # 18.04 (at least)
-        'chronyd.service', # el / opensuse
+        'chronyd.service',  # el / opensuse
         'systemd-timesyncd.service',
-        'ntpd.service', # el7 (at least)
+        'ntpd.service',  # el7 (at least)
         'ntp.service',  # 18.04 (at least)
         'ntpsec.service',  # 20.04 (at least) / buster
     ]
@@ -6348,7 +6348,7 @@ class HostFacts():
                             else:
                                 summary[mode] = 0
                         summary_str = ",".join(["{} {}".format(v, k) for k, v in summary.items()])
-                        security = {**security, **summary} # type: ignore
+                        security = {**security, **summary}  # type: ignore
                         security['description'] += "({})".format(summary_str)
 
                     return security
@@ -7836,7 +7836,7 @@ def main():
         av = sys.argv[1:]
 
     ctx = cephadm_init(av)
-    if not ctx: # error, exit
+    if not ctx:  # error, exit
         sys.exit(1)
 
     try: