You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2022/04/22 13:31:40 UTC
[cloudstack] branch main updated: DB: fix duplicated changes in schema-41610to41700.sql (#6306)
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new bba38fa2ea DB: fix duplicated changes in schema-41610to41700.sql (#6306)
bba38fa2ea is described below
commit bba38fa2ea4a09cb9b55c93ff8fbabe67c5b589c
Author: Wei Zhou <we...@apache.org>
AuthorDate: Fri Apr 22 15:31:33 2022 +0200
DB: fix duplicated changes in schema-41610to41700.sql (#6306)
---
.../resources/META-INF/db/schema-41610to41700.sql | 35 ----------------------
1 file changed, 35 deletions(-)
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql
index 7f82ecf475..32916f0c67 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql
@@ -700,41 +700,6 @@ CREATE VIEW `cloud`.`domain_router_view` AS
and async_job.instance_type = 'DomainRouter'
and async_job.job_status = 0;
-INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) SELECT UUID(), 3, 'listConfigurations', 'ALLOW', (SELECT MAX(`sort_order`)+1 FROM `cloud`.`role_permissions`) ON DUPLICATE KEY UPDATE rule=rule;
-INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) SELECT UUID(), 3, 'updateConfiguration', 'ALLOW', (SELECT MAX(`sort_order`)+1 FROM `cloud`.`role_permissions`) ON DUPLICATE KEY UPDATE rule=rule;
-
--- table for network permissions
-CREATE TABLE `cloud`.`network_permissions` (
- `id` bigint unsigned NOT NULL auto_increment,
- `network_id` bigint unsigned NOT NULL,
- `account_id` bigint unsigned NOT NULL,
- PRIMARY KEY (`id`),
- INDEX `i_network_permission_network_id`(`network_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-INSERT INTO `cloud`.`user_vm_details`(`vm_id`, `name`, `value`)
- SELECT `user_vm_details`.`vm_id`, 'SSH.KeyPairNames', `ssh_keypairs`.`keypair_name`
- FROM `cloud`.`user_vm_details`
- INNER JOIN `cloud`.`ssh_keypairs` ON ssh_keypairs.public_key = user_vm_details.value
- INNER JOIN `cloud`.`vm_instance` ON vm_instance.id = user_vm_details.vm_id
- WHERE ssh_keypairs.account_id = vm_instance.account_id;
-
-ALTER TABLE `cloud`.`kubernetes_cluster` ADD COLUMN `security_group_id` bigint unsigned DEFAULT NULL,
-ADD CONSTRAINT `fk_kubernetes_cluster__security_group_id` FOREIGN KEY `fk_kubernetes_cluster__security_group_id`(`security_group_id`) REFERENCES `security_group`(`id`) ON DELETE CASCADE;
-
--- PR#5984 Create table to persist VM stats.
-DROP TABLE IF EXISTS `cloud`.`vm_stats`;
-CREATE TABLE `cloud`.`vm_stats` (
- `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
- `vm_id` bigint unsigned NOT NULL,
- `mgmt_server_id` bigint unsigned NOT NULL,
- `timestamp` datetime NOT NULL,
- `vm_stats_data` text NOT NULL,
- PRIMARY KEY (`id`)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- PR#5984 Update name for global configuration vm.stats.increment.metrics
-Update configuration set name='vm.stats.increment.metrics' where name='vm.stats.increment.metrics.in.memory';
--
-- Management Server Status
--