You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/10/12 04:25:50 UTC
[18/50] git commit: CLOUDSTACK-273: backport fixes from 3.0.x branch:
70d41f103b9c59b502a4f0cdd7a92533905fa365
CLOUDSTACK-273: backport fixes from 3.0.x branch: 70d41f103b9c59b502a4f0cdd7a92533905fa365
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/62153bba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/62153bba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/62153bba
Branch: refs/heads/javelin
Commit: 62153bba86dda970307c74a110f56e648d315517
Parents: 653889d
Author: Edison Su <su...@gmail.com>
Authored: Fri Oct 5 19:20:48 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Fri Oct 5 19:21:38 2012 -0700
----------------------------------------------------------------------
setup/db/db/schema-2214to30.sql | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/62153bba/setup/db/db/schema-2214to30.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql
index 0b3e454..9e686ef 100755
--- a/setup/db/db/schema-2214to30.sql
+++ b/setup/db/db/schema-2214to30.sql
@@ -722,6 +722,19 @@ UPDATE `cloud`.`network_offerings` SET display_text='Offering for Shared Securit
UPDATE `cloud`.`configuration` SET category = 'Secure' where name in ('alert.smtp.password', 'network.loadbalancer.haproxy.stats.auth', 'security.singlesignon.key', 'project.smtp.password');
+UPDATE `cloud`.`guest_os` set id = 158 where id = 141;
+UPDATE `cloud`.`guest_os` set id = 159 where id = 142;
+UPDATE `cloud`.`guest_os` set id = 160 where id = 143;
+UPDATE `cloud`.`vm_template` set guest_os_id = 158 where guest_os_id = 141;
+UPDATE `cloud`.`vm_template` set guest_os_id = 159 where guest_os_id = 142;
+UPDATE `cloud`.`vm_template` set guest_os_id = 160 where guest_os_id = 143;
+UPDATE `cloud`.`vm_instance` set guest_os_id = 158 where guest_os_id = 141;
+UPDATE `cloud`.`vm_instance` set guest_os_id = 159 where guest_os_id = 142;
+UPDATE `cloud`.`vm_instance` set guest_os_id = 160 where guest_os_id = 143;
+UPDATE `cloud`.`guest_os_hypervisor` set guest_os_id = 158 where guest_os_id = 141;
+UPDATE `cloud`.`guest_os_hypervisor` set guest_os_id = 159 where guest_os_id = 142;
+UPDATE `cloud`.`guest_os_hypervisor` set guest_os_id = 160 where guest_os_id = 143;
+
INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (143, 1, 'CentOS 6.0 (32-bit)');
@@ -748,3 +761,5 @@ UPDATE `cloud`.`networks` n SET n.display_text=(CONCAT('guestNetworkForBasicZon
UPDATE `cloud`.`configuration` SET description='Bypass internal dns, use exetrnal dns1 and dns2' WHERE name='use.external.dns';
UPDATE `cloud`.`configuration` SET category='Alert' WHERE name='capacity.check.period';
UPDATE `cloud`.`vm_instance` SET vnc_password = '' where removed is not null;
+DELETE FROM `cloud`.`host_details` where name in ('storage.network.device1', 'storage.network.device2');
+UPDATE `cloud`.`configuration` SET category = 'Hidden' where name in ('secondary.storage.vm', 'xen.create.pools.in.pod', 'cloud.identifier', 'security.hash.key', 'router.ram.size');