From 8a523476ecaa0fb90ee90da5d02db4c2df5caa6b Mon Sep 17 00:00:00 2001 From: frank Date: Thu, 21 Feb 2013 15:38:36 -0800 Subject: [PATCH] CloudStack CLOUDSTACK-774 Supporting kickstart in CloudStack baremetal remove workaround for unable to deploydb remove wrongly added region upgrade entries --- setup/db/db/schema-40to410.sql | 6 ------ utils/src/com/cloud/utils/db/Transaction.java | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index 42165fc2d7b..1758d84b185 100644 --- a/setup/db/db/schema-40to410.sql +++ b/setup/db/db/schema-40to410.sql @@ -1631,12 +1631,6 @@ CREATE VIEW `cloud`.`data_center_view` AS left join `cloud`.`domain` ON data_center.domain_id = domain.id; -INSERT INTO `cloud`.`region` values ('1','Local','http://localhost:8080/client/api','',''); -ALTER TABLE `cloud`.`account` ADD COLUMN `region_id` int unsigned NOT NULL DEFAULT '1'; -ALTER TABLE `cloud`.`user` ADD COLUMN `region_id` int unsigned NOT NULL DEFAULT '1'; -ALTER TABLE `cloud`.`domain` ADD COLUMN `region_id` int unsigned NOT NULL DEFAULT '1'; - -ALTER TABLE `cloud_usage`.`account` ADD COLUMN `region_id` int unsigned NOT NULL DEFAULT '1'; CREATE TABLE `cloud`.`baremetal_dhcp_devices` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java index 33942700cac..c1f157ed7a2 100755 --- a/utils/src/com/cloud/utils/db/Transaction.java +++ b/utils/src/com/cloud/utils/db/Transaction.java @@ -97,8 +97,8 @@ public class Transaction { /* FIXME: We need a better solution for this * Initialize encryption if we need it for db.properties */ - //EncryptionSecretKeyChecker enc = new EncryptionSecretKeyChecker(); - //enc.check(); + EncryptionSecretKeyChecker enc = new EncryptionSecretKeyChecker(); + enc.check(); } private final LinkedList _stack;