openstack
/
adjutant
Code Issues Proposed changes

Ensuring user isn't created until keystone has roles 

Change-Id: I1509e553d4819aad6508a8cdcf62dd461c39a221
This commit is contained in:
adriant 2015-07-22 16:14:10 +12:00
parent 6bb6b1c70f
commit 3683b3a8c7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stacktask/base/models.py
View File

@ -283,7 +283,11 @@ class NewUser(UserAction):
roles = []
for role in self.default_roles:
roles.append(id_manager.find_role(role))
ks_role = id_manager.find_role(role)
if ks_role:
roles.append(ks_role)
else:
raise TypeError("Keystone missing role: %s" % role)
user = id_manager.create_user(
name=self.username, password=token_data['password'],
@ -425,7 +429,11 @@ class NewProject(UserAction):
try:
roles = []
for role in self.default_roles:
roles.append(id_manager.find_role(role))
ks_role = id_manager.find_role(role)
if ks_role:
roles.append(ks_role)
else:
raise TypeError("Keystone missing role: %s" % role)
user = id_manager.create_user(
name=self.username, password=token_data['password'],