Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1033: Don't fail if no private key has been provided in DigitalOcean

This commit is contained in:
Ignasi Barrera 2015-11-02 13:03:55 +01:00
parent 3fbd399f6b
commit 575d39e7c5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/strategy/CreateKeyPairsThenCreateNodes.java
View File

@ -16,7 +16,6 @@
*/
package org.jclouds.digitalocean2.compute.strategy;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import java.security.PublicKey;
@ -101,11 +100,11 @@ public class CreateKeyPairsThenCreateNodes extends CreateNodesWithGroupEncodedIn
generateKeyPairAndAddKeyToSet(options, generatedSshKeyIds, group);
}
// If there is a script to run in the node, make sure a private key has been configured so jclouds will be able to
// access the node
if (options.getRunScript() != null) {
checkArgument(!Strings.isNullOrEmpty(options.getLoginPrivateKey()),
"no private key configured for: %s; please use options.overrideLoginPrivateKey(rsa_private_text)", group);
// If there is a script to run in the node, make sure a private key has
// been configured so jclouds will be able to access the node
if (options.getRunScript() != null && Strings.isNullOrEmpty(options.getLoginPrivateKey())) {
logger.warn(">> A runScript has been configured but no SSH key has been provided."
+ " Authentication will delegate to the ssh-agent");
}
// If there is a key configured, then make sure there is a key pair for it