From a3b7248a16431291d69230f007cf5ab7d6959a17 Mon Sep 17 00:00:00 2001 From: tuna Date: Wed, 11 Dec 2013 15:58:32 +0700 Subject: [PATCH] enable stp on ovstunnel --- scripts/vm/hypervisor/xenserver/ovstunnel | 4 ++++ scripts/vm/network/vnet/ovstunnel.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel index 6ecd8ea7757..106be0441ce 100755 --- a/scripts/vm/hypervisor/xenserver/ovstunnel +++ b/scripts/vm/hypervisor/xenserver/ovstunnel @@ -82,6 +82,10 @@ def setup_ovs_bridge(session, args): # TODO: Make sure xs-network-uuid is set into external_ids lib.do_cmd([lib.VSCTL_PATH, "set", "Bridge", bridge, "external_ids:xs-network-uuid=%s" % xs_nw_uuid]) + + # enable stp + lib.do_cmd([lib.VSCTL_PATH, "set", "Bridge", bridge, "stp_enable=true"]) + # Non empty result means something went wrong if res: result = "FAILURE:%s" % res diff --git a/scripts/vm/network/vnet/ovstunnel.py b/scripts/vm/network/vnet/ovstunnel.py index 225876a88e1..9e054133b40 100755 --- a/scripts/vm/network/vnet/ovstunnel.py +++ b/scripts/vm/network/vnet/ovstunnel.py @@ -42,6 +42,10 @@ def setup_ovs_bridge(bridge, key, cs_host_id): #set gre_key to bridge res = lib.do_cmd([lib.VSCTL_PATH, "set", "bridge", bridge, "other_config:gre_key=%s" % key]) + + # enable stp + lib.do_cmd([lib.VSCTL_PATH, "set", "Bridge", bridge, "stp_enable=true"]) + logging.debug("Bridge has been manually created:%s" % res) if res: # result = "FAILURE:%s" % res