Updated Branches: refs/heads/master 9dd650aca -> 84be2ab3b
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/84be2ab3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84be2ab3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84be2ab3 Branch: refs/heads/master Commit: 84be2ab3be8c6496dae7b24bc1fc1a581ec74ae1 Parents: 9dd650a Author: Anthony Xu <anthony...@citrix.com> Authored: Mon Nov 25 16:06:00 2013 -0800 Committer: Anthony Xu <anthony...@citrix.com> Committed: Mon Nov 25 16:06:48 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/84be2ab3/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 8ca515f..6dfc0d4 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 @@ -749,6 +749,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/84be2ab3/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 2cc0ec0..a8ab691 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 @@ -5987,7 +5987,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);
