Locking and querying by os_type and os_version

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>