git commit: updated refs/heads/master to 2742227

[bh...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/master c37060a1f -> 274222769


CLOUDSTACK-8252: Ignore VLAN 4095 which is n/a on linux

VLAN id 4095 is commonly used as a 'tag passthrough' in virtualization environments
(VMware, specifically). This vlan id is incompatible with Linux, but we can
allow the admin to manually configure the bridge if the same passthrough is
desired.

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit aee35c96a8157e36b1237dc537bb5b01e1657d61)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/27422276
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/27422276
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/27422276

Branch: refs/heads/master
Commit: 274222769acb1b90d3465a4b8bcab0f1688ff0b5
Parents: c37060a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri May 22 13:22:40 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri May 22 13:26:06 2015 +0100

----------------------------------------------------------------------
 scripts/vm/network/vnet/modifyvlan.sh | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/27422276/scripts/vm/network/vnet/modifyvlan.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/network/vnet/modifyvlan.sh b/scripts/vm/network/vnet/modifyvlan.sh
index 021dfa2..24a38a1 100755
--- a/scripts/vm/network/vnet/modifyvlan.sh
+++ b/scripts/vm/network/vnet/modifyvlan.sh
@@ -167,6 +167,11 @@ then
    modprobe 8021q >& /dev/null
 fi
 
+if [ "$vlanId" -eq 4095 ]
+then
+    exit 0
+fi
+
 if [ "$op" == "add" ]
 then
 	# Add the vlan