Repository: cloudstack Updated Branches: refs/heads/4.8 8f330b0b9 -> e43a4ebf3
Skip VXLANs when rewriting the bridge name for migrations Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9bf7512 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9bf7512 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9bf7512 Branch: refs/heads/4.8 Commit: e9bf7512b4c0764cece808c280438b3c84745d7c Parents: a0aa060 Author: Aaron Brady <[email protected]> Authored: Thu Apr 21 15:19:56 2016 +0100 Committer: Aaron Brady <[email protected]> Committed: Tue May 17 10:15:53 2016 +0100 ---------------------------------------------------------------------- agent/bindir/libvirtqemuhook.in | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9bf7512/agent/bindir/libvirtqemuhook.in ---------------------------------------------------------------------- diff --git a/agent/bindir/libvirtqemuhook.in b/agent/bindir/libvirtqemuhook.in index 3f290c6..9fbe037 100755 --- a/agent/bindir/libvirtqemuhook.in +++ b/agent/bindir/libvirtqemuhook.in @@ -26,6 +26,8 @@ def isOldStyleBridge(brName): else: return False def isNewStyleBridge(brName): + if brName.startswith('brvx-'): + return False if re.match(r"br(\w+)-(\d+)", brName) == None: return False else:
