Visiting Vietnam as a tourist.

Hello,
In August , I am planning to spend my first holiday week in Thailand / flight from Canada to Bangkok/,
second week in Vietnam/ flight from Bangkok to Ho Chi Minh/
and after I am coming back to Bangkok and flying back to Canada.
Do I have to have Vietnam- Visa open in Canada or I can get it in Airport upon arrival to Ho Chi Min?
Thank you.