Manchester City will have an emotional reunion at the Etihad in the Champions League after the draw was made on Thursday.