cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From frankzh...@apache.org
Subject git commit: updated refs/heads/4.2 to ad9be80
Date Thu, 01 Aug 2013 21:46:08 GMT
Updated Branches:
  refs/heads/4.2 ebb30898c -> ad9be8046


CloudStack CLOUDSTACK-3986
baremetal - create basic zone for baremetal fail - Dhcp service provider for this network
does not support the dhcp across multiple subnets


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

Branch: refs/heads/4.2
Commit: ad9be8046f4574de483da3fc6a88c74264c8110a
Parents: ebb3089
Author: frank <frank.zhang@citrix.com>
Authored: Thu Aug 1 14:55:46 2013 -0700
Committer: frank <frank.zhang@citrix.com>
Committed: Thu Aug 1 14:55:46 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/baremetal/networkservice/BaremetalDhcpElement.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad9be804/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
index 96d702d..34e8302 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
@@ -65,7 +65,8 @@ public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProv
     static {
         Capability cap = new Capability(BaremetalDhcpManager.BAREMETAL_DHCP_SERVICE_CAPABITLITY);
         Map<Capability, String> baremetalCaps = new HashMap<Capability, String>();
-        baremetalCaps.put(cap, null);
+        baremetalCaps.put(cap, null);
+        baremetalCaps.put(Capability.DhcpAccrossMultipleSubnets, Boolean.TRUE.toString());
         capabilities = new HashMap<Service, Map<Capability, String>>();
         capabilities.put(Service.Dhcp, baremetalCaps);
     }


Mime
View raw message