Update to use correct puppet modules

Change-Id: Ia40e6dffa5c560c2b35bc9a6cf208eca2637819b