Add agent_package param

It is not called 'puppet' in at least one distro
Identation fix