Fixed puppet file issues and moved default key variable location