Repository: cloudstack Updated Branches: refs/heads/4.3 19b72d6cf -> 433be68a6
CLOUDSTACK-6886 - Fixed the issue created by the SSL feature with the SDX: Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/433be68a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/433be68a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/433be68a Branch: refs/heads/4.3 Commit: 433be68a6c3372bdba30ba05c1c6eda64944bb88 Parents: 19b72d6 Author: Will Stevens <[email protected]> Authored: Tue Jul 22 17:28:01 2014 -0400 Committer: Sebastien Goasguen <[email protected]> Committed: Tue Jul 22 18:32:39 2014 -0400 ---------------------------------------------------------------------- .../src/com/cloud/network/resource/NetscalerResource.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/433be68a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java index 4cd70cb..5142d96 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java @@ -248,7 +248,7 @@ public class NetscalerResource implements ServerResource { //enable load balancing feature enableLoadBalancingFeature(); - SSL.enableSslFeature(_netscalerService); + SSL.enableSslFeature(_netscalerService, _isSdx); //if the the device is cloud stack provisioned then make it part of the public network if (_cloudManaged) { @@ -1927,8 +1927,10 @@ public class NetscalerResource implements ServerResource { } } - - private static void enableSslFeature(nitro_service ns) throws ExecutionException { + private static void enableSslFeature(nitro_service ns, boolean isSdx) throws ExecutionException { + if (isSdx) { + return; + } try { base_response result = ns.enable_features(new String[]{"SSL"}); if (result.errorcode != 0)
