xenserver: Force reload of config file after VIF deleted

When a VIF is deleted, the "vif" script modifies "/etc/ovs-vswitchd.conf".
After changes are made to the config file, ovs-vswitchd should be told
to reload it, but this wasn't happening.  Now it does.

Thanks to Natasha for catching this.

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 35ada1f1e98992cde341ed86b04c7a953b13c3ba..aebb4ccdac59771dbf03b81b66f5a6f6de173070 100755 (executable)
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -128,9 +128,10 @@ remove)
        xenstore-rm "${HOTPLUG}/hotplug"
        vif=vif${DOMID}.${DEVID}
        logger -t scripts-vif "${vif} has been removed"
-        $cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
-            --del-match="bridge.*.port=${vif}" \
+       $cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
+           --del-match="bridge.*.port=${vif}" \
            --del-match="vlan.${vif}.[!0-9]*" \
            --del-match="port.${vif}.[!0-9]*" -c
+       $service vswitch reload
        ;;
 esac