Add puppet directories
Replace fixed hostname by fqdn
Add memory and cpu options