i'd start with stuff like side by side walks on leash, time in the same room with them on leash so no one can harm any one. For the walks, make sure the first few times at lest the puppy can't jump on older dog. Manage the space as needed. Reward the older dog when he is calm and relaxed (really read the body language) when puppy is in the room.
Honestly the older dog didn't do anything terrible. the puppy ran into him rudely and he told her firmly that wasn't acceptable and the puppy wasn't hurt. I wouldn't push it to see if the older does nip but an air snap and growl can be a totally legit for of communication. i wouldn't correct the older dog is anyone is doing that.