You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/04/08 16:01:10 UTC
jclouds git commit: Properly clone the login credentials
Repository: jclouds
Updated Branches:
refs/heads/master a3b7f3ab8 -> 058c0fa54
Properly clone the login credentials
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/058c0fa5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/058c0fa5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/058c0fa5
Branch: refs/heads/master
Commit: 058c0fa54bda10219f8478ac2e76f5076fd915d8
Parents: a3b7f3a
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Apr 7 22:54:14 2015 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Apr 8 16:00:29 2015 +0200
----------------------------------------------------------------------
.../jclouds/compute/options/TemplateOptions.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/058c0fa5/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
index 4770f65..450969f 100644
--- a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
+++ b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
@@ -86,14 +86,17 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
to.blockUntilRunning(false);
if (!this.shouldBlockOnComplete())
to.blockOnComplete(false);
- if (this.getLoginUser() != null)
- to.overrideLoginUser(this.getLoginUser());
- if (this.getLoginPassword() != null)
- to.overrideLoginPassword(this.getLoginPassword());
- if (this.getLoginPrivateKey() != null)
- to.overrideLoginPrivateKey(this.getLoginPrivateKey());
- if (this.shouldAuthenticateSudo() != null)
- to.overrideAuthenticateSudo(this.shouldAuthenticateSudo());
+
+ LoginCredentials fromCreds = new LoginCredentials.Builder().
+ user(this.getLoginUser()).
+ password(this.hasLoginPassword() ? this.getLoginPassword() : null).
+ privateKey(this.hasLoginPrivateKeyOption() ? this.getLoginPrivateKey() : null).
+ authenticateSudo(authenticateSudo == null ? false : authenticateSudo).
+ build();
+ if (fromCreds != null) {
+ to.overrideLoginCredentials(fromCreds);
+ }
+
if (this.getTaskName() != null)
to.nameTask(this.getTaskName());
if (!this.getNetworks().isEmpty())