More samples for network devices
Some setups on architectures
Addd puppetversion option
Cleanup