Pep Guardiola will return to former club Barcelona for the first time with Bayern Munich after the two clubs were drawn against each other in the Champions League semifinal.