openstack/horizon
Code Issues Proposed changes

Merge "Update default value of OPENSTACK_KEYSTONE_DEFAULT_ROLE"

Browse Source
This commit is contained in:
Zuul 2022-02-10 20:31:25 +00:00 committed by Gerrit Code Review
commit 8b4e31fbd6
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/configuration/settings.rst
View File

@ -1405,7 +1405,12 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE
.. versionadded:: 2011.3(Diablo) .. versionadded:: 2011.3(Diablo)
Default: ``"_member_"`` .. versionchanged:: 21.0.0(Yoga)
Default: ``"member"``
The default value is changed from ``_member_`` to ``member`` to conform
with what keystone-bootstrap creates.
The name of the role which will be assigned to a user when added to a project. The name of the role which will be assigned to a user when added to a project.
This value must correspond to an existing role name in Keystone. In general, This value must correspond to an existing role name in Keystone. In general,

2
doc/source/contributor/topics/ini-based-configuration.rst
View File

@ -170,7 +170,7 @@ approach will be used in the initial effort.
cfg.StrOpt( cfg.StrOpt(
'default_role', 'default_role',
default='_member_', default='member',
django-setting='OPENSTACK_KEYSTONE_DEFAULT_ROLE', django-setting='OPENSTACK_KEYSTONE_DEFAULT_ROLE',
help=... help=...
) )

12
openstack_dashboard/dashboards/identity/projects/tests.py
View File

@ -1379,13 +1379,13 @@ class DetailProjectViewTests(test.BaseAdminViewTests):
# Check the content of the table # Check the content of the table
users_expected = { users_expected = {
'1': {'roles': ['admin'], '1': {'roles': ['admin'],
'roles_from_groups': [('_member_', 'group_one'), ], }, 'roles_from_groups': [('member', 'group_one'), ], },
'2': {'roles': ['_member_'], '2': {'roles': ['member'],
'roles_from_groups': [], }, 'roles_from_groups': [], },
'3': {'roles': ['_member_'], '3': {'roles': ['member'],
'roles_from_groups': [('_member_', 'group_one'), ], }, 'roles_from_groups': [('member', 'group_one'), ], },
'4': {'roles': [], '4': {'roles': [],
'roles_from_groups': [('_member_', 'group_one'), ], } 'roles_from_groups': [('member', 'group_one'), ], }
} }
users_id_observed = [user.id for user in users_id_observed = [user.id for user in
@ -1490,7 +1490,7 @@ class DetailProjectViewTests(test.BaseAdminViewTests):
"horizon/common/_detail_table.html") "horizon/common/_detail_table.html")
# Check the table content # Check the table content
groups_expected = {'1': ["_member_"], } groups_expected = {'1': ["member"], }
groups_id_observed = [group.id for group in groups_id_observed = [group.id for group in
res.context["groupstable_table"].data] res.context["groupstable_table"].data]

2
openstack_dashboard/defaults.py
View File

@ -367,7 +367,7 @@ OPENSTACK_CINDER_FEATURES = {
# "cloud_admin": "rule:admin_required and domain_id:<your domain id>" # "cloud_admin": "rule:admin_required and domain_id:<your domain id>"
# This value must be the name of the domain whose ID is specified there. # This value must be the name of the domain whose ID is specified there.
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'Default' OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'Default'
OPENSTACK_KEYSTONE_DEFAULT_ROLE = '_member_' OPENSTACK_KEYSTONE_DEFAULT_ROLE = 'member'
# The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the # The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the
# capabilities of the auth backend for Keystone. # capabilities of the auth backend for Keystone.
# If Keystone has been configured to use LDAP as the auth backend then set # If Keystone has been configured to use LDAP as the auth backend then set

5
releasenotes/notes/change-keystone-default-role-3f95b6af11aed63b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The default value of OPENSTACK_KEYSTONE_DEFAULT_ROLE is changed from
_member_ to member to conform with what keystone-bootstrap creates.