From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Tue, 11 Jun 2024 16:33:07 +0000 (-0400)
Subject: Merge pull request #57829 from gukaifeng/adjust_bootstrap_config_priorities
X-Git-Tag: v20.0.0~1764
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22716d31d72930d3b898d944b6cb2ffbb3cfd2f4;p=ceph.git

Merge pull request #57829 from gukaifeng/adjust_bootstrap_config_priorities

cephadm: the user config is preferred during the bootstrap

Reviewed-by: Adam King <adking@redhat.com>
---

22716d31d72930d3b898d944b6cb2ffbb3cfd2f4