From b478eed6550048ef6fdf23b929330de23acc5b54 Mon Sep 17 00:00:00 2001 From: Harikrishna Patnala Date: Tue, 10 Dec 2013 16:24:15 +0530 Subject: [PATCH] CLOUDSTACK-5419: missing parameters in configuration table and to remove unused parameters Signed-off-by: Koushik Das --- server/src/com/cloud/configuration/Config.java | 2 ++ setup/db/db/schema-421to430.sql | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 6ffeb269dfb..b994ce3983c 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -550,6 +550,8 @@ public enum Config { return "VpcManager"; } else if (_componentClass == SnapshotManager.class) { return "SnapshotManager"; + } else if (_componentClass == VMSnapshotManager.class) { + return "VMSnapshotManager"; } else { return "none"; } diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql index ee85cd08466..3a192950c2d 100644 --- a/setup/db/db/schema-421to430.sql +++ b/setup/db/db/schema-421to430.sql @@ -814,3 +814,11 @@ CREATE TABLE `cloud`.`s2s_vpn_gateway_details` ( PRIMARY KEY (`id`), CONSTRAINT `fk_s2s_vpn_gateway_details__s2s_vpn_gateway_id` FOREIGN KEY `fk_s2s_vpn_gateway_details__s2s_vpn_gateway_id`(`s2s_vpn_gateway_id`) REFERENCES `s2s_vpn_gateway`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +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");