X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fetc_init.d_openvswitch;h=29f2cf6051c41d7d3e446066db7b83ef5242af93;hb=f40af195a5b399a6a6cd8d6e91f0c7c2b6e3efc6;hp=c7d0736aa113411a08a61032e29e8a0b1d2f88f6;hpb=753a774f5cd50ffb0c65102faee6e8968dfe9eaf;p=sliver-openvswitch.git diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index c7d0736aa..29f2cf605 100755 --- a/xenserver/etc_init.d_openvswitch +++ b/xenserver/etc_init.d_openvswitch @@ -43,6 +43,16 @@ case `cat /etc/xensource/network.conf` in ;; esac +start_ovs_xapi_sync () { + if daemon_is_running ovs-xapi-sync; then + log_success_msg "ovs-xapi-sync is already running" + else + PYTHONPATH=/usr/share/openvswitch/python \ + /usr/share/openvswitch/scripts/ovs-xapi-sync \ + --log-file --pidfile --detach --monitor unix:/var/run/openvswitch/db.sock + fi +} + start () { set $ovs_ctl ${1-start} set "$@" --system-id="$INSTALLATION_UUID" @@ -68,13 +78,7 @@ start () { fi "$@" - if daemon_is_running ovs-xapi-sync; then - log_success_msg "ovs-xapi-sync is already running" - else - PYTHONPATH=/usr/share/openvswitch/python \ - /usr/share/openvswitch/scripts/ovs-xapi-sync \ - --log-file --pidfile --detach --monitor unix:/var/run/openvswitch/db.sock - fi + start_ovs_xapi_sync $ovs_ctl --protocol=gre enable-protocol @@ -91,6 +95,9 @@ force_reload_kmod () { action "Stopping HA daemon" ha_stop_daemon action "Starting HA daemon" ha_start_daemon fi + + action "Stopping ovs-xapi-sync" stop_daemon ovs-xapi-sync + action "Starting ovs-xapi-sync" start_ovs_xapi_sync } stop () {