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 8d3a0e9cdf1..e3f60f2357f 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 @@ -1055,7 +1055,7 @@ ServerResource { String fname = interfaces[i].getName(); s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'"); if (fname.startsWith("eth") || fname.startsWith("bond") - || fname.startsWith("vlan") || fname.startsWith("em") + || fname.startsWith("vlan") || fname.startsWith("vxlan") || fname.startsWith("em") || fname.matches("^p\\d+p\\d+.*")) { return fname; } diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index 4ed9a57079c..d7c7e78c3ab 100755 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -96,8 +96,9 @@ class networkConfigBase: return False if self.syscfg.env.bridgeType == "openvswitch" and not self.netcfg.isOvsBridge(br): raise CloudInternalException("%s is not an openvswitch bridge" % br) - if self.syscfg.env.bridgeType == "native" and not self.netcfg.isBridge(br): - raise CloudInternalException("%s is not a bridge" % br) + if self.syscfg.env.bridgeType == "native" and not self.netcfg.isBridge(br) and not self.netcfg.isNetworkDev(br): + # traffic label doesn't have to be a bridge, we'll create bridges on it + raise CloudInternalException("%s is not a bridge and not a net device" % br) preCfged = True return preCfged