Wip 7810

NB this is based off https://github.com/ceph/teuthology/pull/298
Okay, I know you're probably beyond frustrated, but I still have an issue here. You take two arguments but your examples are vague as to which they're specifying. :(