Some changes to get the os-compute-single-controller role work again