]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: remove unused/commented out code
authorPatrick Seidensal <pseidensal@suse.com>
Tue, 7 Jul 2020 12:29:12 +0000 (14:29 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 23 Jul 2020 13:20:10 +0000 (15:20 +0200)
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 6aa87f7b0dfd516439a6c75681e20d7dffacaf4d)

src/cephadm/cephadm

index 18db5bdb3093e6b460e3ca6ba2ba6bdc142d8e92..0e3fd41c4aff0769b96923d8d6579d7a412072bd 100755 (executable)
@@ -1808,17 +1808,11 @@ def get_container(fsid, daemon_type, daemon_id,
     ceph_args = []  # type: List[str]
     if daemon_type in Monitoring.components:
         uid, gid = extract_uid_gid_monitoring(daemon_type)
-        m = Monitoring.components[daemon_type]  # type: ignore
-        metadata = m.get('image', dict())  # type: ignore
         monitoring_args = [
             '--user',
             str(uid),
             # FIXME: disable cpu/memory limits for the time being (not supported
             # by ubuntu 18.04 kernel!)
-            #'--cpus',
-            #metadata.get('cpus', '2'),
-            #'--memory',
-            #metadata.get('memory', '4GB')
         ]
         container_args.extend(monitoring_args)
     elif daemon_type == 'crash':
@@ -2818,7 +2812,7 @@ def command_bootstrap():
 
             if not os.path.exists(ssh_dir):
                 makedirs(ssh_dir, ssh_uid, ssh_gid, 0o700)
-                       
+
             auth_keys_file = '%s/authorized_keys' % ssh_dir
             add_newline = False