Add cp3005/3006 to Puppet

Change-Id: I6121f3b461de0bd4ded19651e72369c33a19ac27
Merge "Add cp3005/3006 to Puppet" into production