break systemvm flow
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index feaee2f..90a68da 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -298,7 +298,8 @@
// Hidden
UseSecondaryStorageVm("Hidden", ManagementServer.class, Boolean.class, "secondary.storage.vm", "false", "Deploys a VM per zone to manage secondary storage if true, otherwise secondary storage is mounted on management server", null),
- CreatePoolsInPod("Hidden", ManagementServer.class, Boolean.class, "xen.create.pools.in.pod", "false", "Should we automatically add XenServers into pools that are inside a Pod", null),
+ UseConsoleProxyVm("Hidden", ManagementServer.class, Boolean.class, "console.proxy.vm", "false", "Deploys a VM per zone to manage console proxy if true, otherwise console proxy is mounted on management server", null),
+ CreatePoolsInPod("Hidden", ManagementServer.class, Boolean.class, "xen.create.pools.in.pod", "false", "Should we automatically add XenServers into pools that are inside a Pod", null),
CloudIdentifier("Hidden", ManagementServer.class, String.class, "cloud.identifier", null, "A unique identifier for the cloud.", null),
SSOKey("Secure", ManagementServer.class, String.class, "security.singlesignon.key", null, "A Single Sign-On key used for logging into the cloud", null),
SSOAuthTolerance("Advanced", ManagementServer.class, Long.class, "security.singlesignon.tolerance.millis", "300000", "The allowable clock difference in milliseconds between when an SSO login request is made and when it is received.", null),
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 40edaa3..8f08ba1 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1307,9 +1307,16 @@
throw new ConfigurationException(msg);
}
}
-
- _loadScanner = new SystemVmLoadScanner<Long>(this);
- _loadScanner.initScan(STARTUP_DELAY, _capacityScanInterval);
+
+ String useServiceVM = _configDao.getValue("console.proxy.vm");
+ boolean _useServiceVM = false;
+ if ("true".equalsIgnoreCase(useServiceVM)) {
+ _useServiceVM = true;
+ }
+ if (_useServiceVM) {
+ _loadScanner = new SystemVmLoadScanner<Long>(this);
+ _loadScanner.initScan(STARTUP_DELAY, _capacityScanInterval);
+ }
_resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
_staticPublicIp = _configDao.getValue("consoleproxy.static.publicIp");
