openstack
/
keystone
Code Issues Proposed changes

Merge "Check for already present user without inserting in Bootstrap"

This commit is contained in:
Jenkins 2016-03-16 19:38:59 +00:00 committed by Gerrit Code Review
parent 862068d0ef 4df45708a9
commit a3b38ee041
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keystone/cmd/cli.py
View File

@ -211,6 +211,11 @@ class BootStrap(BaseApp):
# NOTE(morganfainberg): Do not create the user if it already exists.
try:
user = self.identity_manager.get_user_by_name(self.username,
default_domain['id'])
LOG.info(_LI('User %s already exists, skipping creation.'),
self.username)
except exception.UserNotFound:
user = self.identity_manager.create_user(
user_ref={'name': self.username,
'enabled': True,
@ -219,11 +224,6 @@ class BootStrap(BaseApp):
}
)
LOG.info(_LI('Created user %s'), self.username)
except exception.Conflict:
LOG.info(_LI('User %s already exists, skipping creation.'),
self.username)
user = self.identity_manager.get_user_by_name(self.username,
default_domain['id'])
# NOTE(morganfainberg): Do not create the role if it already exists.
try: