From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 15 Sep 2021 14:45:48 +0000 (-0700)
Subject: Merge pull request #42666 from SUSE/wip-fix-52064
X-Git-Tag: v15.2.15~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d61a52c5c7d087a9b404f7fcd70bcbd69742b552;p=ceph.git

Merge pull request #42666 from SUSE/wip-fix-52064

octopus: mgr/cephadm: pass --container-init to cephadm if specified

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
---

d61a52c5c7d087a9b404f7fcd70bcbd69742b552