Repository: brooklyn-server Updated Branches: refs/heads/master 2845946a1 -> 1370ee663
Fix WinRM default port for a BYON location Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2d4c3cd9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2d4c3cd9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2d4c3cd9 Branch: refs/heads/master Commit: 2d4c3cd977f5f6a753b8e2774b5f09bec50a7382 Parents: 2845946 Author: Valentin Aitken <bos...@gmail.com> Authored: Thu Mar 3 19:32:27 2016 +0200 Committer: Valentin Aitken <bos...@gmail.com> Committed: Thu Mar 3 19:33:24 2016 +0200 ---------------------------------------------------------------------- .../org/apache/brooklyn/location/byon/ByonLocationResolver.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2d4c3cd9/core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java index c747c35..3fa528e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java @@ -161,9 +161,10 @@ public class ByonLocationResolver extends AbstractLocationResolver { String host; int port; if (ssh != null) { - userAndHostAndPort = parseUserAndHostAndPort((String)ssh, 22); + userAndHostAndPort = parseUserAndHostAndPort(ssh, 22); } else { - userAndHostAndPort = parseUserAndHostAndPort((String)winrm, 5985); + // TODO set to null and rely on the MachineLocation. If not then make a dependency to WinRmMachineLocation and use its config key name. + userAndHostAndPort = parseUserAndHostAndPort(winrm, vals.get("winrm.useHttps") != null && (Boolean)vals.get("winrm.useHttps") ? 5986 : 5985); } // If there is a tcpPortMapping defined for the connection-port, then use that for ssh/winrm machine
