I wouldn't worry, provided you give the old dog plenty of fuss and don't allow the puppy to pester him then they will soon get along fine. Once the puppy is old enough to go out on walks they will forget any differences, and even if the older dog tells the puppy off they rarely hurt them, they are only doing what the pups mum would do if it got ideas above its station, as you found out with the food.
Give the puppy somewhere of its own such as a cage or pen when it can go to sleep and eat to give the older dog some peace (you will probably find the older dog will go there itself to get away from the pup).
Just don't force the situation and don't tell the older dog off unless it is being really nasty to the pup.