Updated Branches: refs/heads/master ea7b4467d -> c0591531d
CLOUDSTACK-2794: Global parameter "router.template.id" should be removed The parameter was not in use. We use zone/global coonfigutaion parameters router.template.xenserver/vmware/hyperv/kvm/lxc to deploy router Signed-off-by: Abhinandan Prateek <aprat...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec2bf092 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec2bf092 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec2bf092 Branch: refs/heads/master Commit: ec2bf092847a12f0f29c26a01ecfc6add90fedb2 Parents: ea7b446 Author: Harikrishna Patnala <harikrishna.patn...@citrix.com> Authored: Tue Jun 25 12:43:31 2013 +0530 Committer: Abhinandan Prateek <aprat...@apache.org> Committed: Wed Jun 26 15:56:40 2013 +0530 ---------------------------------------------------------------------- .../cloud/agent/manager/AgentManagerImpl.java | 23 +++++++++++--------- server/src/com/cloud/configuration/Config.java | 1 - .../com/cloud/template/TemplateManagerImpl.java | 2 -- setup/db/db/schema-410to420.sql | 1 + 4 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec2bf092/server/src/com/cloud/agent/manager/AgentManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index fb857a7..b24a238 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -126,16 +126,19 @@ import edu.emory.mathcs.backport.java.util.Collections; /** * Implementation of the Agent Manager. This class controls the connection to the agents. * - * @config {@table || Param Name | Description | Values | Default || || port | port to listen on for agent connection. | Integer - * | 8250 || || workers | # of worker threads | Integer | 5 || || router.template.id | default id for template | Integer - * | 1 || || router.ram.size | default ram for router vm in mb | Integer | 128 || || router.ip.address | ip address for - * the router | ip | 10.1.1.1 || || wait | Time to wait for control commands to return | seconds | 1800 || || domain | - * domain for domain routers| String | foo.com || || alert.wait | time to wait before alerting on a disconnected agent | - * seconds | 1800 || || update.wait | time to wait before alerting on a updating agent | seconds | 600 || || - * ping.interval | ping interval in seconds | seconds | 60 || || instance.name | Name of the deployment String | - * required || || start.retry | Number of times to retry start | Number | 2 || || ping.timeout | multiplier to - * ping.interval before announcing an agent has timed out | float | 2.0x || || router.stats.interval | interval to - * report router statistics | seconds | 300s || * } + * @config {@table || Param Name | Description | Values | Default || + * || port | port to listen on for agent connection. | Integer | 8250 || + * || workers | # of worker threads | Integer | 5 || || router.ram.size | default ram for router vm in mb | Integer | 128 || + * || router.ip.address | ip address for the router | ip | 10.1.1.1 || + * || wait | Time to wait for control commands to return | seconds | 1800 || + * || domain | domain for domain routers| String | foo.com || + * || alert.wait | time to wait before alerting on a disconnected agent | seconds | 1800 || + * || update.wait | time to wait before alerting on a updating agent | seconds | 600 || + * || ping.interval | ping interval in seconds | seconds | 60 || + * || instance.name | Name of the deployment String | required || + * || start.retry | Number of times to retry start | Number | 2 || + * || ping.timeout | multiplier to ping.interval before announcing an agent has timed out | float | 2.0x || + * || router.stats.interval | interval to report router statistics | seconds | 300s || } **/ @Local(value = { AgentManager.class }) public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec2bf092/server/src/com/cloud/configuration/Config.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 3a6d3aa..ba50849 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -175,7 +175,6 @@ public enum Config { ExternalNetworkStatsInterval("Advanced", NetworkManager.class, Integer.class, "external.network.stats.interval", "300", "Interval (in seconds) to report external network statistics.", null), RouterCheckInterval("Advanced", NetworkManager.class, Integer.class, "router.check.interval", "30", "Interval (in seconds) to report redundant router status.", null), RouterCheckPoolSize("Advanced", NetworkManager.class, Integer.class, "router.check.poolsize", "10", "Numbers of threads using to check redundant router status.", null), - RouterTemplateId("Advanced", NetworkManager.class, Long.class, "router.template.id", "1", "Default ID for template.", null), RouterTemplateXen("Advanced", NetworkManager.class, String.class, "router.template.xen", "SystemVM Template (XenServer)", "Name of the default router template on Xenserver.", null, ConfigurationParameterScope.zone.toString()), RouterTemplateKVM("Advanced", NetworkManager.class, String.class, "router.template.kvm", "SystemVM Template (KVM)", "Name of the default router template on KVM.", null, ConfigurationParameterScope.zone.toString()), RouterTemplateVmware("Advanced", NetworkManager.class, String.class, "router.template.vmware", "SystemVM Template (vSphere)", "Name of the default router template on Vmware.", null, ConfigurationParameterScope.zone.toString()), http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec2bf092/server/src/com/cloud/template/TemplateManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 273614c..cbf70fa 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -257,7 +257,6 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, UploadDao _uploadDao; @Inject protected GuestOSDao _guestOSDao; - long _routerTemplateId = -1; @Inject StorageManager _storageMgr; @Inject @@ -819,7 +818,6 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params); - _routerTemplateId = NumbersUtil.parseInt(configs.get("router.template.id"), 1); String value = _configDao.getValue(Config.PrimaryStorageDownloadWait.toString()); _primaryStorageDownloadWait = NumbersUtil.parseInt(value, Integer.parseInt(Config.PrimaryStorageDownloadWait.getDefaultValue())); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec2bf092/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index d2add32..2d0f8de 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -30,6 +30,7 @@ INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hype UPDATE `cloud`.`hypervisor_capabilities` SET `storage_motion_supported`=true WHERE id=16; UPDATE `cloud`.`hypervisor_capabilities` SET `storage_motion_supported`=true WHERE id=11; DELETE FROM `cloud`.`configuration` where name='vmware.percluster.host.max'; +DELETE FROM `cloud`.`configuration` where name='router.template.id'; INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'AgentManager', 'xen.nics.max', '7', 'Maximum allowed nics for Vms created on Xen'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'midonet.apiserver.address', 'http://localhost:8081', 'Specify the address at which the Midonet API server can be contacted (if using Midonet)'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'midonet.providerrouter.id', 'd7c5e6a3-e2f4-426b-b728-b7ce6a0448e5', 'Specifies the UUID of the Midonet provider router (if using Midonet)');
