Actually, I wouldn't change how agent_nodes is detected: what matters here is that this is installed on the actual compute nodes. However, for the controller, the change is good.