cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/rbac to 723f6c4
Date Fri, 10 Jan 2014 23:55:02 GMT
Updated Branches:
  refs/heads/rbac 48ed96d36 -> 723f6c48e


- Adding 'path' to IAM group and policy

- Adding the default 'SystemCapability' action for root admin policy
- Adding the default 'DomainCapability' action for domain admin policy
- Adding the default 'DomainResourceCapability' action for domain admin policy


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

Branch: refs/heads/rbac
Commit: 723f6c48eb49523c97fda79882caf9405182c4b2
Parents: 48ed96d
Author: Prachi Damle <prachi@cloud.com>
Authored: Fri Jan 10 15:53:35 2014 -0800
Committer: Prachi Damle <prachi@cloud.com>
Committed: Fri Jan 10 15:53:35 2014 -0800

----------------------------------------------------------------------
 setup/db/db/schema-421to430.sql | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/723f6c48/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 53e52b2..bd18848 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -304,7 +304,7 @@ CREATE TABLE `cloud`.`acl_group` (
   `name` varchar(255) NOT NULL,
   `description` varchar(255) default NULL,
   `uuid` varchar(40),
-  `domain_id` bigint unsigned NOT NULL,  
+  `path` varchar(255) NOT NULL,  
   `account_id` bigint unsigned NOT NULL,
   `view` varchar(40) default 'User' COMMENT 'response review this group account should see
for result',
   `removed` datetime COMMENT 'date the group was removed',
@@ -331,7 +331,7 @@ CREATE TABLE `acl_policy` (
   `name` varchar(255) NOT NULL,
   `description` varchar(255) DEFAULT NULL,
   `uuid` varchar(40) DEFAULT NULL,
-  `domain_id` bigint(20) unsigned NOT NULL,
+  `path` varchar(255) NOT NULL,
   `account_id` bigint unsigned NOT NULL,  
   `removed` datetime DEFAULT NULL COMMENT 'date the role was removed',
   `created` datetime DEFAULT NULL COMMENT 'date the role was created',
@@ -372,7 +372,6 @@ CREATE TABLE `acl_policy_permission` (
   CONSTRAINT `fk_acl_policy_permission__policy_id` FOREIGN KEY (`policy_id`) REFERENCES `acl_policy`
(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
-
 INSERT IGNORE INTO `cloud`.`acl_policy` (id, name, description, uuid, domain_id, account_id,
created, policy_type) VALUES (1, 'NORMAL', 'Domain user role', UUID(), 1, 1, Now(), 'Static');
 INSERT IGNORE INTO `cloud`.`acl_policy` (id, name, description, uuid, domain_id, account_id,
created, policy_type) VALUES (2, 'ADMIN', 'Root admin role', UUID(), 1, 1, Now(), 'Static');
 INSERT IGNORE INTO `cloud`.`acl_policy` (id, name, description, uuid, domain_id, account_id,
created, policy_type) VALUES (3, 'DOMAIN_ADMIN', 'Domain admin role', UUID(), 1, 1, Now(),
'Static');
@@ -393,6 +392,9 @@ INSERT INTO `cloud`.`acl_group_policy_map` (group_id, policy_id, created)
values
 INSERT INTO `cloud`.`acl_group_policy_map` (group_id, policy_id, created) values(4, 4, Now());
 INSERT INTO `cloud`.`acl_group_policy_map` (group_id, policy_id, created) values(5, 5, Now());
 
+INSERT IGNORE INTO `cloud`.`acl_policy_permission` (id, policy_id, action, permission, created)
VALUES (1, 2, 'SystemCapability', 'Allow', Now());
+INSERT IGNORE INTO `cloud`.`acl_policy_permission` (id, policy_id, action, permission, created)
VALUES (1, 3, 'DomainCapability', 'Allow', Now());
+INSERT IGNORE INTO `cloud`.`acl_policy_permission` (id, policy_id, action, permission, created)
VALUES (1, 4, 'DomainResourceCapability', 'Allow', Now());
 
 CREATE OR REPLACE VIEW `cloud`.`acl_policy_view` AS
     select 


Mime
View raw message