Wip 7810

NB this is based off https://github.com/ceph/teuthology/pull/298
Making up the terminology as I go along here.  In my mind an ID is like '2', a role is like 'osd.2', and a role type is like 'osd'