From: Michael Fritch <mfritch@suse.com>
Date: Wed, 12 Feb 2020 18:36:35 +0000 (-0700)
Subject: cephadm: fix deploy crash when no `args.fsid`
X-Git-Tag: v15.1.1~427^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d90d667b3d6a02c0149f3040dcc18e3ee57ed9a;p=ceph.git

cephadm: fix deploy crash when no `args.fsid`

broken by 724199dd873e2a02f67ea2e191093d8080c686a7 when the
crash agent was made to behave like all other services

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8fec14024997..a256563fe89f 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1391,8 +1391,8 @@ def deploy_crash(fsid, uid, gid, config, keyring):
     # type: (str, int, int, str, str) -> None
     crash_dir = os.path.join(args.data_dir, fsid, 'crash')
     makedirs(crash_dir, uid, gid, DATA_DIR_MODE)
-    c = get_container(args.fsid, 'crash', get_hostname())
-    deploy_daemon(args.fsid, 'crash', get_hostname(), c, uid, gid,
+    c = get_container(fsid, 'crash', get_hostname())
+    deploy_daemon(fsid, 'crash', get_hostname(), c, uid, gid,
                   config, keyring)
 
 def get_unit_file(fsid, uid, gid):