This reverts commit f635555fe7, reversing
changes made to d4d3d17b23.
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>