Updated Branches: refs/heads/master 46f25bc91 -> 95308de80
JCLOUDS-105 - fixing a problem caused in cases where vm.isPasswordEnabled() is false and no keypair is specified. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/95308de8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/95308de8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/95308de8 Branch: refs/heads/master Commit: 95308de8087debef04bf8dcc8c1320995e89c53d Parents: 46f25bc Author: Andrew Bayer <[email protected]> Authored: Sun Jun 23 16:08:05 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Sun Jun 23 16:08:05 2013 -0700 ---------------------------------------------------------------------- .../compute/strategy/CloudStackComputeServiceAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/95308de8/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java index 5ad2fff..0da11fb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java @@ -222,10 +222,10 @@ public class CloudStackComputeServiceAdapter implements VirtualMachine vm = blockUntilJobCompletesAndReturnResult.<VirtualMachine>apply(job); logger.debug("--- virtualmachine: %s", vm); LoginCredentials.Builder credentialsBuilder = LoginCredentials.builder(); - if (!vm.isPasswordEnabled() || templateOptions.getKeyPair() != null) { + if (templateOptions.getKeyPair() != null) { SshKeyPair keyPair = keyPairCache.getUnchecked(templateOptions.getKeyPair()); credentialsBuilder.privateKey(keyPair.getPrivateKey()); - } else { + } else if (vm.isPasswordEnabled()) { assert vm.getPassword() != null : vm; credentialsBuilder.password(vm.getPassword()); }
