You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2014/01/23 14:00:55 UTC
[2/3] git commit: updated refs/heads/master to c53778c
CLOUDSTACK-5938 Failing add host in security group enabled zone, when CSP is not installed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4b3784a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4b3784a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4b3784a9
Branch: refs/heads/master
Commit: 4b3784a98e57bc22bc0a8dd53462d452c322cb8c
Parents: f999a01
Author: Jayapal <ja...@apache.org>
Authored: Thu Jan 23 16:33:37 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Thu Jan 23 18:14:12 2014 +0530
----------------------------------------------------------------------
.../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b3784a9/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 ed9eec1..853fd42 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
@@ -4986,6 +4986,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (_securityGroupEnabled) {
_canBridgeFirewall = can_bridge_firewall(conn);
+ if (!_canBridgeFirewall) {
+ String msg = "Failed to configure brige firewall";
+ s_logger.warn(msg);
+ s_logger.warn("Check host " + _host.ip +" for CSP is installed or not and check network mode for bridge");
+ return new SetupAnswer(cmd, msg);
+ }
+
}
String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer.toString(_heartbeatInterval));