Rework Puppetfile dependencies

Change-Id: I5e056b67fc58ee8c106cc77ae6ab095e2cc13150
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>