From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Dec 2019 22:05:26 +0000 (-0600)
Subject: cephadm: clean up shell containers on exit
X-Git-Tag: v15.1.0~456^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef98700e81fa7f91ce5424ef543812642837656b;p=ceph.git

cephadm: clean up shell containers on exit

The run_cmd() was already passing --rm; do it for shell_cmd too so that
we don't leave behind a mess from shell commands, ceph-volume, etc.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0f727af1bbee..8083baa90a22 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1126,6 +1126,7 @@ class CephContainer:
         return [
             str(container_path),
             'run',
+            '--rm',
             '--net=host',
         ] + self.container_args + envs + vols + [
             '--entrypoint', cmd[0],