]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 05ef9e1) | patch
Revert "Merge pull request #37764 from mgfritch/cephadm-no-container-init"
authorSage Weil <sage@newdream.net>
Fri, 12 Feb 2021 20:04:57 +0000 (15:04 -0500)
committerSage Weil <sage@newdream.net>
Mon, 15 Feb 2021 17:40:39 +0000 (12:40 -0500)
commitc896292d5841c10c87eac3948d71f9eec31fe5e5
tree2751981e8fc480de65da9fc6d527ec5097f5857btree | snapshot
parent05ef9e1ad99f5d8d8bf75a02103da5d98d7e1da2commit | diff
Revert "Merge pull request #37764 from mgfritch/cephadm-no-container-init"

This reverts commit f635555fe76322336a1e0e8cc3c199562642ad0e, reversing
changes made to d4d3d17b23fcf6d8808a96b992f56924f495b174.

This PR seems to be (indirectly?) responsible for
  https://tracker.ceph.com/issues/49237

Also, it was causing the rados.py task's follow-up step to wait
for snap trimming to fail: it would time out a 'ceph osd dump --format=json'
command.  :/

Signed-off-by: Sage Weil <sage@newdream.net>
doc/man/8/cephadm.rst diff | blob | history
src/cephadm/cephadm diff | blob | history
src/pybind/mgr/cephadm/module.py diff | blob | history
src/pybind/mgr/cephadm/serve.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.