This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new e1cff7d CLOUDSTACK-10083: Allow ModifySshKeys to be forwarded to the
agent in maintenance mode (#2269)
e1cff7d is described below
commit e1cff7d4350309a2d9fead68e0756ab3b9e85fcf
Author: Marc-Aurèle Brothier <[email protected]>
AuthorDate: Thu Sep 28 09:09:46 2017 +0200
CLOUDSTACK-10083: Allow ModifySshKeys to be forwarded to the agent in
maintenance mode (#2269)
Signed-off-by: Marc-Aurèle Brothier <[email protected]>
---
engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
index d5ec900..a3838e1 100644
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
@@ -31,6 +31,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import com.cloud.agent.api.ModifySshKeysCommand;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
@@ -114,7 +115,7 @@ public abstract class AgentAttache {
StopCommand.class.toString(),
CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(),
CheckHealthCommand.class.toString(),
ReadyCommand.class.toString(), ShutdownCommand.class.toString(),
SetupCommand.class.toString(),
CleanupNetworkRulesCmd.class.toString(),
CheckNetworkCommand.class.toString(), PvlanSetupCommand.class.toString(),
CheckOnHostCommand.class.toString(),
- ModifyTargetsCommand.class.toString() };
+ ModifyTargetsCommand.class.toString(),
ModifySshKeysCommand.class.toString()};
protected final static String[] s_commandsNotAllowedInConnectingMode = new
String[] { StartCommand.class.toString(), CreateCommand.class.toString() };
static {
Arrays.sort(s_commandsAllowedInMaintenanceMode);
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
