cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From frankzh...@apache.org
Subject [1/7] git commit: refs/heads/4.1 - CloudStack CLOUDSTACK-774 Supporting kickstart in CloudStack baremetal
Date Thu, 21 Feb 2013 23:34:58 GMT
CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

remove workaround for unable to deploydb
remove wrongly added region upgrade entries


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/172de303
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/172de303
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/172de303

Branch: refs/heads/4.1
Commit: 172de303411678b8601c11849ef29f07c6d918b5
Parents: 5f0bb8a
Author: frank <frank.zhang@citrix.com>
Authored: Thu Feb 21 15:38:36 2013 -0800
Committer: frank <frank.zhang@citrix.com>
Committed: Thu Feb 21 15:39:15 2013 -0800

----------------------------------------------------------------------
 setup/db/db/schema-40to410.sql                |    6 ------
 utils/src/com/cloud/utils/db/Transaction.java |    4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/172de303/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index dce2177..25aa37a 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -1671,12 +1671,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',

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/172de303/utils/src/com/cloud/utils/db/Transaction.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java
index 3394270..c1f157e 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<StackElement> _stack;


Mime
View raw message