Merge "ironic: stop deploying n-cpu"