You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/06/24 01:19:30 UTC
git commit: JCLOUDS-105 - fixing CloudStack logic for case where
password is not enabled *and* no keypair is specified
Updated Branches:
refs/heads/1.6.x ca369df7c -> 091881ab2
JCLOUDS-105 - fixing CloudStack logic for case where password is not enabled *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/091881ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/091881ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/091881ab
Branch: refs/heads/1.6.x
Commit: 091881ab209c9098e93b5730016bb23800ffa188
Parents: ca369df
Author: Andrew Bayer <an...@gmail.com>
Authored: Sun Jun 23 16:19:08 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Sun Jun 23 16:19:08 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/091881ab/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());
}