Fixes for running os-c-c after rebuild

We should run os-c-c on controller hosts before compute nodes, and we
also need to re-disable it after rebuilding.