You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by tu...@apache.org on 2013/12/11 10:00:42 UTC
git commit: updated refs/heads/master to a3b7248
Updated Branches:
refs/heads/master b385cb4f7 -> a3b7248a1
enable stp on ovstunnel
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3b7248a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3b7248a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3b7248a
Branch: refs/heads/master
Commit: a3b7248a16431291d69230f007cf5ab7d6959a17
Parents: b385cb4
Author: tuna <ng...@gmail.com>
Authored: Wed Dec 11 15:58:32 2013 +0700
Committer: tuna <ng...@gmail.com>
Committed: Wed Dec 11 15:58:32 2013 +0700
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/ovstunnel | 4 ++++
scripts/vm/network/vnet/ovstunnel.py | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3b7248a/scripts/vm/hypervisor/xenserver/ovstunnel
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel
index 6ecd8ea..106be04 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3b7248a/scripts/vm/network/vnet/ovstunnel.py
----------------------------------------------------------------------
diff --git a/scripts/vm/network/vnet/ovstunnel.py b/scripts/vm/network/vnet/ovstunnel.py
index 225876a..9e05413 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