Repository: brooklyn-server Updated Branches: refs/heads/master 280d0ce05 -> dd6d9b78b
Getting the correct value for WinRmMachineLocation.USE_HTTPS_WINRM - the config still doesn't contain the correct value for USE_HTTPS_WINRM, when it is set via provisioning.properties Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a5a20ac5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a5a20ac5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a5a20ac5 Branch: refs/heads/master Commit: a5a20ac5984d74f07e4db4318d855e10e2d5a5ca Parents: e7cd823 Author: Yavor Yanchev <[email protected]> Authored: Tue May 30 11:43:11 2017 +0300 Committer: Yavor Yanchev <[email protected]> Committed: Tue May 30 11:43:11 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a5a20ac5/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java index 074ec5f..f97518d 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java @@ -766,7 +766,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im if (windows) { int newLoginPort = node.getLoginPort() == 22 - ? (getConfig(WinRmMachineLocation.USE_HTTPS_WINRM) ? 5986 : 5985) + ? (setup.get(WinRmMachineLocation.USE_HTTPS_WINRM) ? 5986 : 5985) : node.getLoginPort(); String newLoginUser = "root".equals(node.getCredentials().getUser()) ? "Administrator"
