Merge "Be more verbose in logging role grant on bootstrap"

This commit is contained in:
Zuul 2019-04-06 21:01:50 +00:00 committed by Gerrit Code Review
commit 5053f149ee
1 changed files with 6 additions and 6 deletions

View File

@ -218,14 +218,14 @@ class Bootstrapper(object):
project_id=self.project_id,
role_id=self.admin_role_id
)
LOG.info('Granted %(role)s on %(project)s to user'
' %(username)s.',
LOG.info('Granted role %(role)s on project %(project)s to'
'user %(username)s.',
{'role': self.admin_role_name,
'project': self.project_name,
'username': self.admin_username})
except exception.Conflict:
LOG.info('User %(username)s already has %(role)s on '
'%(project)s.',
LOG.info('User %(username)s already has role %(role)s on '
'project %(project)s.',
{'username': self.admin_username,
'role': self.admin_role_name,
'project': self.project_name})
@ -241,12 +241,12 @@ class Bootstrapper(object):
PROVIDERS.assignment_api.create_system_grant_for_user(
self.admin_user_id, self.admin_role_id
)
LOG.info('Granted %(role)s on the system to user'
LOG.info('Granted role %(role)s on the system to user'
' %(username)s.',
{'role': self.admin_role_name,
'username': self.admin_username})
except exception.Conflict:
LOG.info('User %(username)s already has %(role)s on '
LOG.info('User %(username)s already has role %(role)s on '
'the system.',
{'username': self.admin_username,
'role': self.admin_role_name})