Updates to both scripts

python-guestfs non-interactive install still failing on compute1
networks need to be trimmed back to remove virbr interfaces