cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/4.3 to d13c343
Date Tue, 26 Nov 2013 00:06:16 GMT
Updated Branches:
  refs/heads/4.3 abb95c101 -> d13c343cb


CLOUDSTACK-4913: Don't enable ebtables/iptables for non-security group zone


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

Branch: refs/heads/4.3
Commit: d13c343cbc2eeca4140ea3f0304d4afaf23530e0
Parents: abb95c1
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Mon Nov 25 16:06:00 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Mon Nov 25 16:06:00 2013 -0800

----------------------------------------------------------------------
 .../hypervisor/xen/discoverer/XcpServerDiscoverer.java   | 11 +++++++++++
 .../hypervisor/xen/resource/CitrixResourceBase.java      |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d13c343c/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 688488d..1333af3 100755
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -745,6 +745,17 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer,
L
     }
 
     @Override
+    protected HashMap<String, Object> buildConfigParams(HostVO host){
+        HashMap<String, Object> params = super.buildConfigParams(host);
+        DataCenterVO zone = _dcDao.findById(host.getDataCenterId());
+        if ( zone != null ) {
+            boolean securityGroupEnabled = zone.isSecurityGroupEnabled();
+            params.put("securitygroupenabled", Boolean.toString(securityGroupEnabled));
+        }
+        return params;
+    }
+
+    @Override
     public boolean stop() {
     	_resourceMgr.unregisterResourceStateAdapter(this.getClass().getSimpleName());
         return super.stop();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d13c343c/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index aadfc17..f6df605 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -6007,7 +6007,6 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
                 details.put("private.network.device", _privateNetworkName);
             }
 
-            details.put("can_bridge_firewall", Boolean.toString(_canBridgeFirewall));
             cmd.setHostDetails(details);
             cmd.setName(hr.nameLabel);
             cmd.setGuid(_host.uuid);


Mime
View raw message