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.2 to 3ebcfa9
Date Thu, 14 Nov 2013 00:29:44 GMT
Updated Branches:
  refs/heads/4.2 4238ac9e6 -> 3ebcfa9a7


save securitygroupenabled in host details


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

Branch: refs/heads/4.2
Commit: 3ebcfa9a7cb371bf0c8a3459e6d12ef1a359a700
Parents: 4238ac9
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Wed Nov 13 16:27:58 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Wed Nov 13 16:27:58 2013 -0800

----------------------------------------------------------------------
 .../com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java    | 1 +
 .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ebcfa9a/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 377f15f..d3a345f 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));

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ebcfa9a/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 e485458..85c57c5 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);


Mime
View raw message