From: John Mulligan <jmulligan@redhat.com>
Date: Fri, 20 Oct 2023 14:30:16 +0000 (-0400)
Subject: cephadm: ensure entrypoint is assigned a string
X-Git-Tag: v19.0.0~150^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eaacc0e29eea372a21bbf868a57cbcc4cfbe2ce7;p=ceph.git

cephadm: ensure entrypoint is assigned a string

Ensure that the entrypoint variable is assigned a string. The
custom container class can have None and that can confuse future
refactoring.
The mypy command we're using does not notice this.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 9a36360bf2dc..b47d12f92493 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -2832,7 +2832,7 @@ def get_container(
         privileged = True
     elif daemon_type == CustomContainer.daemon_type:
         cc = CustomContainer.init(ctx, ident.fsid, ident.daemon_id)
-        entrypoint = cc.entrypoint
+        entrypoint = cc.entrypoint or ''
         host_network = False
         envs.extend(cc.get_container_envs())
         container_args.extend(cc.get_container_args())