openstack/devstack
Code Issues Proposed changes

Merge "Use member instead of Member"

Browse Source
This commit is contained in:
Zuul 2018-06-27 09:06:11 +00:00 committed by Gerrit Code Review
commit 282145a480
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/horizon
View File

@ -87,7 +87,7 @@ function configure_horizon {
_horizon_config_set $local_settings "" WEBROOT \"$HORIZON_APACHE_ROOT/\" _horizon_config_set $local_settings "" WEBROOT \"$HORIZON_APACHE_ROOT/\"
_horizon_config_set $local_settings "" COMPRESS_OFFLINE True _horizon_config_set $local_settings "" COMPRESS_OFFLINE True
_horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_DEFAULT_ROLE \"Member\" _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_DEFAULT_ROLE \"member\"
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\" _horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"

29
lib/keystone
View File

@ -309,30 +309,32 @@ function configure_keystone {
# service -- -- # service -- --
# -- -- service # -- -- service
# -- -- ResellerAdmin # -- -- ResellerAdmin
# -- -- Member # -- -- member
# demo admin admin # demo admin admin
# demo demo Member, anotherrole # demo demo member, anotherrole
# alt_demo admin admin # alt_demo admin admin
# alt_demo alt_demo Member, anotherrole # alt_demo alt_demo member, anotherrole
# invisible_to_admin demo Member # invisible_to_admin demo member
# Group Users Roles Project # Group Users Roles Project
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# admins admin admin admin # admins admin admin admin
# nonadmins demo, alt_demo Member, anotherrole demo, alt_demo # nonadmins demo, alt_demo member, anotherrole demo, alt_demo
# Migrated from keystone_data.sh # Migrated from keystone_data.sh
function create_keystone_accounts { function create_keystone_accounts {
# The keystone bootstrapping process (performed via keystone-manage bootstrap) # The keystone bootstrapping process (performed via keystone-manage
# creates an admin user, admin role and admin project. As a sanity check # bootstrap) creates an admin user, admin role, member role, and admin
# we exercise the CLI to retrieve the IDs for these values. # project. As a sanity check we exercise the CLI to retrieve the IDs for
# these values.
local admin_project local admin_project
admin_project=$(openstack project show "admin" -f value -c id) admin_project=$(openstack project show "admin" -f value -c id)
local admin_user local admin_user
admin_user=$(openstack user show "admin" -f value -c id) admin_user=$(openstack user show "admin" -f value -c id)
local admin_role="admin" local admin_role="admin"
local member_role="member"
get_or_add_user_domain_role $admin_role $admin_user default get_or_add_user_domain_role $admin_role $admin_user default
@ -349,17 +351,6 @@ function create_keystone_accounts {
# role is also configurable in swift-proxy.conf # role is also configurable in swift-proxy.conf
get_or_create_role ResellerAdmin get_or_create_role ResellerAdmin
# The Member role is used by Horizon and Swift so we need to keep it:
local member_role="member"
# Capital Member role is legacy hard coded in Horizon / Swift
# configs. Keep it around.
get_or_create_role "Member"
# The reality is that the rest of the roles listed below honestly
# should work by symbolic names.
get_or_create_role $member_role
# another_role demonstrates that an arbitrary role may be created and used # another_role demonstrates that an arbitrary role may be created and used
# TODO(sleepsonthefloor): show how this can be used for rbac in the future! # TODO(sleepsonthefloor): show how this can be used for rbac in the future!
local another_role="anotherrole" local another_role="anotherrole"