apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CloudStack CLOUDSTACK-774

Browse Source 
Supporting kickstart in CloudStack baremetal

remove workaround for unable to deploydb
remove wrongly added region upgrade entries
This commit is contained in:
frank 2013-02-21 15:38:36 -08:00
parent 8855d793ee
commit 8a523476ec
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup/db/db/schema-40to410.sql
View File

@ -1631,12 +1631,6 @@ CREATE VIEW `cloud`.`data_center_view` AS
left join left join
`cloud`.`domain` ON data_center.domain_id = domain.id; `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` ( CREATE TABLE `cloud`.`baremetal_dhcp_devices` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',

4
utils/src/com/cloud/utils/db/Transaction.java
View File

@ -97,8 +97,8 @@ public class Transaction {
/* FIXME: We need a better solution for this /* FIXME: We need a better solution for this
* Initialize encryption if we need it for db.properties * Initialize encryption if we need it for db.properties
*/ */
//EncryptionSecretKeyChecker enc = new EncryptionSecretKeyChecker(); EncryptionSecretKeyChecker enc = new EncryptionSecretKeyChecker();
//enc.check(); enc.check();
} }
private final LinkedList<StackElement> _stack; private final LinkedList<StackElement> _stack;