Thanks Kishan! Cheers,
Hugo > On 27 nov. 2014, at 13:50, Kishan Kavala <kishan.kav...@citrix.com> wrote: > > Added commit 1091d458 to 4.5 branch. > > Regards, > Kishan > > -----Original Message----- > From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] > Sent: Thursday, November 27, 2014 3:14 PM > To: dev > Subject: Re: Differences in schema-442to450.sql between 4.5 and master > > Please take note that people that made the change probably made it to > schema-441to450.sql which I renamed. > > On Thu, Nov 27, 2014 at 10:32 AM, Hugo Trippaers <h...@trippaers.nl> wrote: >> See this diff: >> Hugos-MacBook-Pro-7:cloudstack hugo (master)$ git diff master 4.5 >> setup/db/db/schema-442to450.sql diff --git >> a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql >> index f84bca6..083943b 100644 >> --- a/setup/db/db/schema-442to450.sql >> +++ b/setup/db/db/schema-442to450.sql >> @@ -753,8 +753,6 @@ INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, >> category_id, display_name, crea INSERT IGNORE INTO `cloud`.`guest_os` >> (id, uuid, category_id, display_name, created) VALUES (247, UUID(), 3, >> 'Oracle Linux 7', utc_timestamp()); INSERT IGNORE INTO >> `cloud`.`guest_os` (id, uuid, category_id, display_name, created) >> VALUES (248, UUID(), 1, 'CentOS 6 (32-bit)', utc_timestamp()); INSERT >> IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, >> created) VALUES (249, UUID(), 1, 'CentOS 6 (64-bit)', >> utc_timestamp()); -INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, >> category_id, display_name, created) VALUES (250, UUID(), 3, 'Oracle >> Enterprise Linux 6.5 (32-bit)', utc_timestamp()); -INSERT IGNORE INTO >> `cloud`.`guest_os` (id, uuid, category_id, display_name, created) >> VALUES (251, UUID(), 3, 'Oracle Enterprise Linux 6.5 (64-bit)', >> utc_timestamp()); >> >> INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` >> (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, >> created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT >> IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 @@ -837,8 +835,6 >> @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` >> (uuid,hypervisor_type, hypervis INSERT IGNORE INTO >> `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE >> INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE >> INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 -INSERT IGNORE >> INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 -INSERT IGNORE >> INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE >> INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE >> INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE >> INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, >> hypervisor_version, guest_os_name, guest_os_id, created, >> is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 @@ -935,16 +931,6 >> @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` >> (uuid,hypervisor_type, hypervis >> >> INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, >> hypervisor_type, hypervisor_version, max_guests_limit, >> security_group_enabled, max_data_volumes_limit, storage_motion_sup >> >> -update vlan set vlan_id=concat('vlan://', vlan_id) where vlan_type = >> "VirtualNetwork" and vlan_id not like "vlan://%"; >> - >> -CREATE TABLE `cloud`.`baremetal_rct` ( >> - `id` bigint unsigned UNIQUE AUTO_INCREMENT, >> - `uuid` varchar(40) UNIQUE NOT NULL, >> - `url` varchar(2048) NOT NULL, >> - `rct` text NOT NULL, >> - PRIMARY KEY (`id`) >> -) ENGINE = InnoDB DEFAULT CHARSET=utf8; >> - >> --Remove duplicates from guest_os_hypervisor table DELETE t1 FROM >> guest_os_hypervisor t1, guest_os_hypervisor t2 WHERE >> (t1.hypervisor_type = t2.hypervisor_type AND t1.hypervisor_version = >> t2.hypervisor_version AND t1.guest_os_id = >> >> @@ -958,9 +944,6 @@ ALTER TABLE `cloud`.`user_vm_details` MODIFY >> `value` VARCHAR(5120); >> >> UPDATE `cloud`.`host` SET resource = REPLACE(resource, >> 'com.cloud.hypervisor.xen.resource', >> 'com.cloud.hypervisor.xenserver.resource') WHERE >> hypervisor_type='XenServer' AND REMOVED >> >> -INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, >> created, type, hvm, bits, account_id, url, checksum, enable_password, >> display_text, format, guest_os_id, fe >> - VALUES (11, UUID(), 'centos7-x86_64-lxc', 'CentOS 7(64-bit) no GUI >> (LXC)', 1, now(), 'BUILTIN', 0, 64, 1, >> 'http://download.cloud.com/templates/builtin/centos-7-x86_64.tar.gz', >> - >> --Support for RHEL 6.5 in relevant hypervisor versions INSERT IGNORE >> INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) >> VALUES (252, UUID(), 4, 'Red Hat Enterprise Linux 6.5 (32-bit)', >> utc_timestamp()); INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, >> category_id, display_name, created) VALUES (253, UUID(), 4, 'Red Hat >> Enterprise Linux 6.5 (64-bit)', utc_timestamp()); >> >> >> Can everybody who made changes to this file check and fix? >> >> Cheers, >> >> Hugo > > > > -- > Daan
