Merge "Set cpu_mode to none for os-ha-ovs"