From b55997d39bd498b9824dd42fc20088c3a43ece8a Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 5 Mar 2012 14:25:59 -0800 Subject: [PATCH] allow SetupCommand when resource is in maintenance mode. Since maintenance is resource state not agent status right now --- server/src/com/cloud/agent/manager/AgentAttache.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/agent/manager/AgentAttache.java b/server/src/com/cloud/agent/manager/AgentAttache.java index 56489ede88e..70575bca3a4 100755 --- a/server/src/com/cloud/agent/manager/AgentAttache.java +++ b/server/src/com/cloud/agent/manager/AgentAttache.java @@ -44,6 +44,7 @@ import com.cloud.agent.api.MaintainCommand; import com.cloud.agent.api.MigrateCommand; import com.cloud.agent.api.PingTestCommand; import com.cloud.agent.api.ReadyCommand; +import com.cloud.agent.api.SetupCommand; import com.cloud.agent.api.ShutdownCommand; import com.cloud.agent.api.StartCommand; import com.cloud.agent.api.StopCommand; @@ -107,7 +108,7 @@ public abstract class AgentAttache { protected AgentManagerImpl _agentMgr; public final static String[] s_commandsAllowedInMaintenanceMode = - new String[] { MaintainCommand.class.toString(), MigrateCommand.class.toString(), StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(), CheckHealthCommand.class.toString(), ReadyCommand.class.toString(), ShutdownCommand.class.toString() }; + new String[] { MaintainCommand.class.toString(), MigrateCommand.class.toString(), StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(), CheckHealthCommand.class.toString(), ReadyCommand.class.toString(), ShutdownCommand.class.toString(), SetupCommand.class.toString() }; protected final static String[] s_commandsNotAllowedInConnectingMode = new String[] { StartCommand.class.toString(), CreateCommand.class.toString() }; static {