Manchester City will face Real Madrid over two legs while Celtic take on Bayern Munich in the knockout play-off round.