cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to c2e2f6c
Date Sat, 02 Nov 2013 00:18:27 GMT
Updated Branches:
  refs/heads/master 918bc7405 -> c2e2f6ce6


relax KVM agent setup to allow non-bridge traffic labels
(guest bridges are created on physical device, no need for bridge traffic label)


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

Branch: refs/heads/master
Commit: c2e2f6ce633e4c6b986fdd055db5411b3e1c53d6
Parents: 918bc74
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Fri Nov 1 18:16:54 2013 -0600
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Fri Nov 1 18:16:54 2013 -0600

----------------------------------------------------------------------
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
 python/lib/cloudutils/serviceConfig.py                          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2e2f6ce/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 8d3a0e9..e3f60f2 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;
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2e2f6ce/python/lib/cloudutils/serviceConfig.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
index 4ed9a57..d7c7e78 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


Mime
View raw message