From 1f8c4864d627faecb733faf4c0e8683a52e52215 Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 4 Feb 2011 14:00:37 -0800 Subject: [PATCH] bug 8171: adding checks to ensure we do not start cp for any vm start unless we are out of maintenance status 8171: resolved fixed --- .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 32fbc33af23..f56369db58c 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -438,6 +438,10 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx return proxy; } + String restart = _configDao.getValue(Config.ConsoleProxyRestart.key()); + if(restart != null && restart.equalsIgnoreCase("false")) + return null; + if(proxy.getState() == VirtualMachine.State.Stopped) { return _itMgr.start(proxy, null, systemUser, systemAcct); }