[Cloud-admin] Toolforge puppet refactor options