clean firewall

* also revert back to puppet module repo