diff --git a/src/group/Group.cc b/src/group/Group.cc index 3e6930c0cc..6882a8bd23 100644 --- a/src/group/Group.cc +++ b/src/group/Group.cc @@ -353,7 +353,7 @@ void Group::add_admin_rules(int user_id) NebulaLog::log("GROUP",Log::ERROR,error_msg); } - // # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER/@ USE+MANAGE * + // # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER+VMGROUP/@ USE+MANAGE * if ( aclm->add_rule( AclRule::INDIVIDUAL_ID | user_id, @@ -365,6 +365,7 @@ void Group::add_admin_rules(int user_id) PoolObjectSQL::DOCUMENT | PoolObjectSQL::SECGROUP | PoolObjectSQL::VROUTER | + PoolObjectSQL::VMGROUP | AclRule::GROUP_ID | oid, @@ -449,7 +450,7 @@ void Group::del_admin_rules(int user_id) NebulaLog::log("GROUP",Log::ERROR,error_msg); } - // # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER/@ USE+MANAGE * + // # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER+VMGROUP/@ USE+MANAGE * if ( aclm->del_rule( AclRule::INDIVIDUAL_ID | user_id, @@ -461,6 +462,7 @@ void Group::del_admin_rules(int user_id) PoolObjectSQL::DOCUMENT | PoolObjectSQL::SECGROUP | PoolObjectSQL::VROUTER | + PoolObjectSQL::VMGROUP | AclRule::GROUP_ID | oid, diff --git a/src/oca/ruby/opennebula/acl.rb b/src/oca/ruby/opennebula/acl.rb index 9d54b12f88..2680689dbf 100644 --- a/src/oca/ruby/opennebula/acl.rb +++ b/src/oca/ruby/opennebula/acl.rb @@ -23,14 +23,17 @@ module OpenNebula # @ # ALL # RESOURCE -> + separated list and "/{#,@,%}|ALL" - # VM, + # VM # HOST # NET # IMAGE # USER # TEMPLATE # GROUP - # ACL + # DATASTORE + # CLUSTER + # DOCUMENT + # ZONE # SECGROUP # VDC # VROUTER diff --git a/src/oca/ruby/opennebula/group.rb b/src/oca/ruby/opennebula/group.rb index f31809ca92..0232db71bb 100644 --- a/src/oca/ruby/opennebula/group.rb +++ b/src/oca/ruby/opennebula/group.rb @@ -37,7 +37,7 @@ module OpenNebula SELF = -1 # Default resource ACL's for group users (create) - GROUP_DEFAULT_ACLS = "VM+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER" + GROUP_DEFAULT_ACLS = "VM+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER+VMGROUP" # The default view for group and group admins, must be defined in # sunstone_views.yaml