openstack/devstack
Code Issues Proposed changes

Merge "Add roles when we create groups"

Browse Source
This commit is contained in:
Jenkins
2015-04-03 16:18:30 +00:00
committed by Gerrit Code Review
parent 70843539a4 4599fd174c
commit 9942db6d87
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/keystone
View File

@@ -366,6 +366,12 @@ function configure_keystone_extensions {
# demo demo Member, anotherrole
# invisible_to_admin demo Member
# Group Users Roles Tenant
# ------------------------------------------------------------------
# admins admin admin admin
# nonadmin demo Member, anotherrole demo
# Migrated from keystone_data.sh
function create_keystone_accounts {
@@ -407,8 +413,14 @@ function create_keystone_accounts {
get_or_add_user_project_role $another_role $demo_user $demo_tenant
get_or_add_user_project_role $member_role $demo_user $invis_tenant
get_or_create_group "developers" "default" "openstack developers"
get_or_create_group "testers" "default"
local admin_group=$(get_or_create_group "admins" \
"default" "openstack admin group")
local non_admin_group=$(get_or_create_group "nonadmins" \
"default" "non-admin group")
get_or_add_group_project_role $member_role $non_admin_group $demo_tenant
get_or_add_group_project_role $another_role $non_admin_group $demo_tenant
get_or_add_group_project_role $admin_role $admin_group $admin_tenant
# Keystone
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then