From 44860a9589606e9a8ea8878b02d70da48382e808 Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Mon, 3 Sep 2012 16:05:23 +0530 Subject: [PATCH] bug CS-15971: Moved fix to 304to305 upgrade reviewed-by: Abhi --- setup/db/db/schema-2214to30.sql | 2 -- setup/db/db/schema-304to305.sql | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql index 809b1984071..0accb6aa829 100755 --- a/setup/db/db/schema-2214to30.sql +++ b/setup/db/db/schema-2214to30.sql @@ -759,5 +759,3 @@ UPDATE `cloud`.`networks` n SET n.display_text=(CONCAT('guestNetworkForBasicZon UPDATE `cloud`.`configuration` SET description='Bypass internal dns, use external 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'); diff --git a/setup/db/db/schema-304to305.sql b/setup/db/db/schema-304to305.sql index c66e802ae74..b1b49fdacac 100755 --- a/setup/db/db/schema-304to305.sql +++ b/setup/db/db/schema-304to305.sql @@ -381,4 +381,4 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag DROP TABLE IF EXISTS `cloud`.`ovs_tunnel_account`; UPDATE `cloud`.`snapshots` set swift_id=null where swift_id=0; - +DELETE FROM `cloud`.`host_details` where name in ('storage.network.device1', 'storage.network.device2');