Wip 7810

NB this is based off https://github.com/ceph/teuthology/pull/298