Yeah, there was reason in the original model for OpenStackRole (as opposed to DeploymentRole), but the latter was dropped in favor of just using HostGroups. It's the same way with OpenStackService -- Layout wouldn't have needed it in any case, so I'll just drop it from all models here.