Also disable openvswitch-switch

This is to avoid strange GRE traffic flood happening on SDN VLAN.

also slightly reworked the for/if to allow this in spite of set -e