From 3ebcfa9a7cb371bf0c8a3459e6d12ef1a359a700 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Wed, 13 Nov 2013 16:27:58 -0800 Subject: [PATCH] save securitygroupenabled in host details --- .../com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 1 + .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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 377f15fc2fc..d3a345fc1c8 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 @@ -312,6 +312,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L DataCenterVO zone = _dcDao.findById(dcId); boolean securityGroupEnabled = zone.isSecurityGroupEnabled(); params.put("securitygroupenabled", Boolean.toString(securityGroupEnabled)); + details.put("securitygroupenabled", Boolean.toString(securityGroupEnabled)); params.put("wait", Integer.toString(_wait)); details.put("wait", Integer.toString(_wait)); 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 e485458a70f..85c57c587c4 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 @@ -5902,7 +5902,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);