Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95CD710AA9 for ; Mon, 2 Sep 2013 20:05:13 +0000 (UTC) Received: (qmail 212 invoked by uid 500); 2 Sep 2013 20:05:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 99660 invoked by uid 500); 2 Sep 2013 20:04:50 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 99242 invoked by uid 99); 2 Sep 2013 20:04:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2013 20:04:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1F4FD8BBFB5; Mon, 2 Sep 2013 20:04:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Mon, 02 Sep 2013 20:05:15 -0000 Message-Id: In-Reply-To: <50cd0f4b28224616847f6afdbcbb1698@git.apache.org> References: <50cd0f4b28224616847f6afdbcbb1698@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] [abbrv] git commit: updated refs/heads/disk-cache to 99d67cb Fix upgrade Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1fc8749a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1fc8749a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1fc8749a Branch: refs/heads/disk-cache Commit: 1fc8749aae95b3407938a5a6f7d3993ce16fc94a Parents: c48553c Author: Alex Huang Authored: Fri Aug 2 10:35:58 2013 -0700 Committer: Alex Huang Committed: Fri Aug 2 11:07:57 2013 -0700 ---------------------------------------------------------------------- setup/db/db/schema-410to420.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fc8749a/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 07f227f..b2fe2ed 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -27,6 +27,9 @@ ALTER TABLE `cloud`.`hypervisor_capabilities` ADD CONSTRAINT `uc_hypervisor` UNI ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `max_hosts_per_cluster` int unsigned DEFAULT NULL COMMENT 'Max. hosts in cluster supported by hypervisor'; ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `storage_motion_supported` int(1) unsigned DEFAULT 0 COMMENT 'Is storage motion supported'; +ALTER TABLE volumes ADD COLUMN vm_snapshot_chain_size bigint(20) unsigned; +ALTER TABLE volumes ADD COLUMN iso_id bigint(20) unsigned; + UPDATE `cloud`.`hypervisor_capabilities` SET `max_hosts_per_cluster`=32 WHERE `hypervisor_type`='VMware'; INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, storage_motion_supported) VALUES (UUID(), 'XenServer', '6.1.0', 50, 1, 13, 1); INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, storage_motion_supported) VALUES (UUID(), 'XenServer', '6.2.0', 50, 1, 13, 1); @@ -2219,8 +2222,5 @@ CREATE TABLE `cloud_usage`.`usage_vmsnapshot` ( INDEX `i_usage_vmsnapshot` (`account_id`,`id`,`vm_id`,`created`) ) ENGINE=InnoDB CHARSET=utf8; -ALTER TABLE volumes ADD COLUMN vm_snapshot_chain_size bigint(20) unsigned; -ALTER TABLE volumes ADD COLUMN iso_id bigint(20) unsigned; - INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'healthcheck.update.interval', '600', 'Time Interval to fetch the LB health check states (in sec)'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Snapshots', 'DEFAULT', 'SnapshotManager', 'KVM.snapshot.enabled', 'false', 'whether snapshot is enabled for KVM hosts');