From f12f7da0bab343d86c9243a2fee2953cffccf344 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Thu, 17 Mar 2011 16:33:11 -0700 Subject: [PATCH] fixed everyting to upgrade from 2.1.7 to 2.2.2 --- setup/db/schema-21to22.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/db/schema-21to22.sql b/setup/db/schema-21to22.sql index 8c42713bed9..29747ccee06 100755 --- a/setup/db/schema-21to22.sql +++ b/setup/db/schema-21to22.sql @@ -40,7 +40,6 @@ CREATE TABLE `cloud`.`op_it_work` ( `created_at` bigint unsigned NOT NULL COMMENT 'when was this work detail created', `thread` varchar(255) NOT NULL COMMENT 'thread name', `type` char(32) NOT NULL COMMENT 'type of work', - `vm_type` char(32) NOT NULL COMMENT 'type of vm', `step` char(32) NOT NULL COMMENT 'state', `updated_at` bigint unsigned NOT NULL COMMENT 'time it was taken over', `instance_id` bigint unsigned NOT NULL COMMENT 'vm instance', @@ -204,6 +203,7 @@ CREATE TABLE `cloud`.`firewall_rules` ( `domain_id` bigint unsigned NOT NULL COMMENT 'domain id', `network_id` bigint unsigned NOT NULL COMMENT 'network id', `xid` char(40) NOT NULL COMMENT 'external id', + `is_static_nat` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if firewall rule is one to one nat rule', `created` datetime COMMENT 'Date created', PRIMARY KEY (`id`), CONSTRAINT `fk_firewall_rules__ip_address_id` FOREIGN KEY(`ip_address_id`) REFERENCES `user_ip_address`(`id`),