Merge "Fix naming and ips for controller and compute"