You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/12/20 01:48:30 UTC
git commit: updated refs/heads/master to 7644b92
Updated Branches:
refs/heads/master 62bb5d884 -> 7644b92a8
account for vxlan interfaces named vx<vni>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7644b92a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7644b92a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7644b92a
Branch: refs/heads/master
Commit: 7644b92a8b9910ac3b38bddd7272951348aa2d19
Parents: 62bb5d8
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Thu Dec 19 17:40:12 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Thu Dec 19 17:42:42 2013 -0700
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7644b92a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index a2c6682..cd4ab26 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1042,7 +1042,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
for (int i = 0; i < interfaces.length; i++) {
String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '" + fname + "'");
- if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("vlan") || fname.startsWith("vxlan") || fname.startsWith("em") ||
+ if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
fname.matches("^p\\d+p\\d+.*")) {
return fname;
}