Updated Branches: refs/heads/master 727c5bae9 -> 4c1ace5e0
CLOUDSTACK-2775: Fix trunk port is not 1 on some hosts Now searching for eth- or em- prefix, as the port for going outside. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c1ace5e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c1ace5e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c1ace5e Branch: refs/heads/master Commit: 4c1ace5e02edb04c0aee8641334e8a0eb2bd5b5c Parents: 727c5ba Author: Sheng Yang <sheng.y...@citrix.com> Authored: Thu May 30 16:53:39 2013 -0700 Committer: Sheng Yang <sheng.y...@citrix.com> Committed: Tue Jun 4 11:32:23 2013 -0700 ---------------------------------------------------------------------- scripts/vm/network/ovs-pvlan-vm.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c1ace5e/scripts/vm/network/ovs-pvlan-vm.sh ---------------------------------------------------------------------- diff --git a/scripts/vm/network/ovs-pvlan-vm.sh b/scripts/vm/network/ovs-pvlan-vm.sh index fd38481..06e41fe 100755 --- a/scripts/vm/network/ovs-pvlan-vm.sh +++ b/scripts/vm/network/ovs-pvlan-vm.sh @@ -86,7 +86,8 @@ then exit 1 fi -trunk_port=1 +# try to find the physical link to outside, only supports eth and em prefix now +trunk_port=`ovs-ofctl show $br | egrep "\((eth|em)[0-9]" | cut -d '(' -f 1|tr -d ' '` if [ "$op" == "add" ] then
