Merge "Mv Nova, Neutron, Horizon out of controller.yaml"