unittest_osdmap: revert a few broken changes

From commit 80ea6067f790b9431ae6744c38a034833e8ad4ab.

Signed-off-by: Sage Weil <sage@redhat.com>