From: Sage Weil <sage@newdream.net>
Date: Thu, 13 May 2021 14:38:40 +0000 (-0500)
Subject: Merge pull request #40737 from Daniel-Pivonka/octopus-backport-40477
X-Git-Tag: v15.2.13~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfe186d7b39d5371af82320943cd74d3bacd9788;p=ceph.git

Merge pull request #40737 from Daniel-Pivonka/octopus-backport-40477

octopus: cephadm: fix failure when using --apply-spec and --shh-user
---

dfe186d7b39d5371af82320943cd74d3bacd9788