You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/12/11 00:52:23 UTC
[43/50] [abbrv] git commit: updated refs/heads/ui-restyle to 326b3a6
CLOUDSTACK-5419: missing parameters in configuration table and to remove unused parameters
Signed-off-by: Koushik Das <ko...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50360976
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50360976
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50360976
Branch: refs/heads/ui-restyle
Commit: 5036097659d395a66ba36213ac1cfcd6e34bf6aa
Parents: 1ddc0b9
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Tue Dec 10 16:47:07 2013 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Tue Dec 10 16:49:44 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/configuration/Config.java | 2 ++
setup/db/db/schema-421to430.sql | 7 +++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50360976/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 afc09d6..f08ca24 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -2009,6 +2009,8 @@ public enum Config {
return "VpcManager";
} else if (_componentClass == SnapshotManager.class) {
return "SnapshotManager";
+ } else if (_componentClass == VMSnapshotManager.class) {
+ return "VMSnapshotManager";
} else {
return "none";
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50360976/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 5f81050..1ec4e94 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -806,3 +806,10 @@ ALTER TABLE `cloud`.`alert` ADD COLUMN `name` varchar(255) DEFAULT NULL COMMENT
UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit`=13 WHERE `hypervisor_type`='Vmware';
ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `is_exclusive_gslb_provider` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is acting exclusively as gslb service provider in the zone and can not be used for LB';
+
+DELETE FROM `cloud`.`configuration` WHERE `name` IN ("xen.update.url", "update.check.interval", "baremetal_dhcp_devices", "host.updates.enable");
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'VMSnapshotManager', "vmsnapshot.create.wait", "1800", "In second, timeout for create vm snapshot", NULL, NULL,NULL,0);
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'VMSnapshotManager', "vmsnapshot.max", "10", "Maximum vm snapshots for a vm", NULL, NULL,NULL,0);
+
+UPDATE `cloud`.`configuration` SET `component` = 'VMSnapshotManager' WHERE `name` IN ("vmsnapshot.create.wait", "vmsnapshot.max");