Merge "openstack control nodes for large setup"