rhtyd closed pull request #2697: agent: Avoid sudo, renew certificates assuming
root
URL: https://github.com/apache/cloudstack/pull/2697
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/agent/src/com/cloud/agent/Agent.java
b/agent/src/com/cloud/agent/Agent.java
index 8a6c24b8ed4..67115e649a1 100644
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -728,7 +728,7 @@ public Answer setupAgentKeystore(final SetupKeyStoreCommand
cmd) {
_shell.setPersistentProperty(null,
KeyStoreUtils.KS_PASSPHRASE_PROPERTY, storedPassword);
}
- Script script = new Script(true, _keystoreSetupPath, 60000, s_logger);
+ Script script = new Script(_keystoreSetupPath, 60000, s_logger);
script.add(agentFile.getAbsolutePath());
script.add(keyStoreFile);
script.add(storedPassword);
@@ -772,7 +772,7 @@ private Answer setupAgentCertificate(final
SetupCertificateCommand cmd) {
throw new CloudRuntimeException("Unable to save received agent
client and ca certificates", e);
}
- Script script = new Script(true, _keystoreCertImportPath, 60000,
s_logger);
+ Script script = new Script(_keystoreCertImportPath, 60000, s_logger);
script.add(agentFile.getAbsolutePath());
script.add(keyStoreFile);
script.add(KeyStoreUtils.AGENT_MODE);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
