]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #55973 from adk3798/wip-62531-quincy
authorAdam King <47704447+adk3798@users.noreply.github.com>
Mon, 18 Mar 2024 12:24:15 +0000 (08:24 -0400)
committerGitHub <noreply@github.com>
Mon, 18 Mar 2024 12:24:15 +0000 (08:24 -0400)
quincy: mgr/cephadm: allow draining host without removing conf/keyring files

Reviewed-by: John Mulligan <jmulligan@redhat.com>
1  2 
src/pybind/mgr/cephadm/inventory.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/osd.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py

Simple merge
Simple merge
Simple merge