Added back changed reverted by merge

This commit is contained in:
alena 2011-09-13 11:11:54 -07:00
parent 162e5cf50a
commit c4efac2083
1 changed files with 6 additions and 3 deletions

View File

@ -17,6 +17,9 @@ DELETE FROM `cloud`.`configuration` where name='vmware.guest.nic.device.type';
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.lb.enabled', 'true', 'If agent load balancing enabled in cluster setup');
update `cloud`.`vm_template` set hypervisor_type='XenServer' where unique_name='xs-tools.iso';
ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40);
ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40);
ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_accountId`(`type`, `account_id`);
ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_domaintId`(`type`, `domain_id`);