summaryrefslogtreecommitdiff
path: root/keystone/api/roles.py
diff options
context:
space:
mode:
authorwangxiyuan <wangxiyuan@huawei.com>2018-08-31 15:05:00 +0800
committerwangxiyuan <wangxiyuan@huawei.com>2018-08-31 15:22:48 +0800
commitc838d93c35fdacae5f5bd77a55c62978b8a0b138 (patch)
treeaca0a68105e928f8676e7a4b1ff96d350019eed7 /keystone/api/roles.py
parent6b6250b79e6455dfcf8019e1bafcd0f2114ff0da (diff)
downloadkeystone-c838d93c35fdacae5f5bd77a55c62978b8a0b138.tar.gz
Remove member_role_id/name
Remove depepated ``member_role_id`` and ``member_role_name`` config options. Change-Id: I4a29d52da8a7b97baa0cbc52b011b3225fe6ab54 bp: removed-as-of-stein
Diffstat (limited to 'keystone/api/roles.py')
-rw-r--r--keystone/api/roles.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/keystone/api/roles.py b/keystone/api/roles.py
index bc6c31204..606594911 100644
--- a/keystone/api/roles.py
+++ b/keystone/api/roles.py
@@ -112,13 +112,7 @@ class RoleResource(ks_flask.ResourceBase):
else:
ENFORCER.enforce_call(action='identity:create_role')
validation.lazy_validate(schema.role_create, role)
- if role['name'] == CONF.member_role_name:
- # Use the configured member role ID when creating the configured
- # member role name. This avoids the potential of creating
- # a "member" role with an unexpected ID.
- role['id'] = CONF.member_role_id
- else:
- role = self._assign_unique_id(role)
+ role = self._assign_unique_id(role)
role = self._normalize_dict(role)
ref = PROVIDERS.role_api.create_role(
role['id'], role, initiator=self.audit_initiator)