From: Patrick Seidensal <pseidensal@suse.com>
Date: Tue, 7 Jul 2020 12:29:12 +0000 (+0200)
Subject: cephadm: remove unused/commented out code
X-Git-Tag: v15.2.5~105^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3e9a37fefa7fd611dbf55105940409df633e130;p=ceph.git

cephadm: remove unused/commented out code

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 6aa87f7b0dfd516439a6c75681e20d7dffacaf4d)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 18db5bdb3093..0e3fd41c4aff 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -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