ceph-disk-* refactor

The new 'list' is obviously incomplete and there's no remove yet, but I'd like to pull in the refactor sooner rather than later to get the testing.