You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/06/03 18:22:35 UTC
[2/4] incubator-brooklyn git commit: Fix jclouds createUser
Fix jclouds createUser
- was accidentally being done twice, with the second time
failing because it had disabled ssh’ing as root!
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3ef5a0f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3ef5a0f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3ef5a0f4
Branch: refs/heads/master
Commit: 3ef5a0f447fca47367635a3113f6bc3906c0c8ce
Parents: 892823d
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jun 3 11:28:28 2015 +0200
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jun 3 11:28:28 2015 +0200
----------------------------------------------------------------------
.../main/java/brooklyn/location/jclouds/JcloudsLocation.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ef5a0f4/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
index 23b79ed..e0e7990 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
@@ -679,14 +679,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
}
}
- if (waitForSshable && skipJcloudsSshing && !windows) {
- // once that host:port is definitely reachable, we can create the user
- waitForReachable(computeService, node, sshHostAndPortOverride, node.getCredentials(), setup);
- userCredentials = createUser(computeService, node, sshHostAndPortOverride, setup);
- } else if (windows) {
- waitForWinRmAvailable(node, node.getCredentials(), setup);
- }
-
// Figure out which login-credentials to use
LoginCredentials customCredentials = setup.get(CUSTOM_CREDENTIALS);
if (customCredentials != null) {