You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:48:33 UTC
[03/50] brooklyn-server git commit: JcloudsLocation talks to
SshMachineLocation using 'user' rather than 'username',
prevents spurious warnings
JcloudsLocation talks to SshMachineLocation using 'user' rather than 'username', prevents spurious warnings
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9d829c01
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9d829c01
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9d829c01
Branch: refs/heads/0.4.0
Commit: 9d829c012abb9672293c73de8ef425df18f9d830
Parents: eb15ee5
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 26 00:06:28 2012 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 26 00:06:28 2012 -0400
----------------------------------------------------------------------
.../java/brooklyn/location/basic/jclouds/JcloudsLocation.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9d829c01/core/src/main/java/brooklyn/location/basic/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/jclouds/JcloudsLocation.java b/core/src/main/java/brooklyn/location/basic/jclouds/JcloudsLocation.java
index 741d575..058e545 100644
--- a/core/src/main/java/brooklyn/location/basic/jclouds/JcloudsLocation.java
+++ b/core/src/main/java/brooklyn/location/basic/jclouds/JcloudsLocation.java
@@ -434,7 +434,7 @@ public class JcloudsLocation extends AbstractLocation implements MachineProvisio
MutableMap.builder()
.put("address", vmHostname)
.put("displayName", vmHostname)
- .put("username", setup.allconf.get("userName"))
+ .put("user", setup.allconf.get("userName"))
.put("config", sshConfig)
.build(),
this,
@@ -564,7 +564,7 @@ public class JcloudsLocation extends AbstractLocation implements MachineProvisio
MutableMap.builder()
.put("address", hostname)
.put("displayName", hostname)
- .put("username", username)
+ .put("user", username)
.put("config", sshConfig)
.build(),
this,
@@ -872,7 +872,7 @@ public class JcloudsLocation extends AbstractLocation implements MachineProvisio
if (truth(allconf.get("privateKeyPassphrase")))
sshConfig.put("privateKeyPassphrase", allconf.get("privateKeyPassphrase"));
// TODO messy way to get an SSH session
- SshMachineLocation sshLocByIp = new SshMachineLocation(MutableMap.of("address", ip, "username", allconf.get("userName"), "config", sshConfig));
+ SshMachineLocation sshLocByIp = new SshMachineLocation(MutableMap.of("address", ip, "user", allconf.get("userName"), "config", sshConfig));
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
ByteArrayOutputStream errStream = new ByteArrayOutputStream();