Separate puppet agent and master config