diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 17facd3cd5b..f3dea967475 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -389,7 +389,6 @@ CREATE TABLE `cloud`.`volumes` ( `attached` datetime COMMENT 'Date Attached', `updated` datetime COMMENT 'Date updated for attach/detach', `removed` datetime COMMENT 'Date removed. not null if removed', - `status` varchar(32) COMMENT 'Async API volume creation status', `state` varchar(32) COMMENT 'State machine', `source_id` bigint unsigned COMMENT 'id for the source', `source_type` varchar(32) COMMENT 'source from which the volume is created -- snapshot, diskoffering, template, blank', diff --git a/setup/db/db/schema-222to224-cleanup.sql b/setup/db/db/schema-222to224-cleanup.sql index 3066b580a17..5dffc56454a 100644 --- a/setup/db/db/schema-222to224-cleanup.sql +++ b/setup/db/db/schema-222to224-cleanup.sql @@ -4,3 +4,9 @@ DELETE FROM `cloud`.`account_vlan_map` WHERE account_id IS NULL; ALTER TABLE `cloud`.`data_center` DROP COLUMN `enable`; ALTER TABLE `cloud`.`host_pod_ref` DROP COLUMN `enabled`; DELETE FROM `cloud`.`configuration` WHERE name in ('direct.attach.security.groups.enabled', 'direct.attach.untagged.vlan.enabled', 'hypervisor.type', 'management-server', 'max.volume.size.gb', 'multicast.throttling.rate', 'network.type', 'xen.preallocated.lun.size.range'); + +ALTER TABLE `cloud`.`volumes` DROP COLUMN `status`; + +ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_ip_address; +ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_mac_address; +ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_netmask; diff --git a/setup/db/db/schema-222to224.sql b/setup/db/db/schema-222to224.sql index 63ba1618246..c6489b7e189 100644 --- a/setup/db/db/schema-222to224.sql +++ b/setup/db/db/schema-222to224.sql @@ -133,8 +133,3 @@ UPDATE `cloud`.`service_offering` s, `cloud`.`disk_offering` d SET s.ha_enabled= ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__account_id` FOREIGN KEY `fk_vm_instance__account_id` (`account_id`) REFERENCES `account` (`id`); ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__service_offering_id` FOREIGN KEY `fk_vm_instance__service_offering_id` (`service_offering_id`) REFERENCES `service_offering` (`id`); - - -ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_ip_address; -ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_mac_address; -ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_netmask;