Merge "Add provider UUID to reshaper gen conflict error"

This commit is contained in:
Zuul 2019-01-21 16:50:10 +00:00 committed by Gerrit Code Review
commit 24d97d0f60
1 changed files with 3 additions and 2 deletions

View File

@ -66,9 +66,10 @@ def reshape(req):
generation = inventory_data['resource_provider_generation']
if generation != resource_provider.generation:
raise webob.exc.HTTPConflict(
_('resource provider generation conflict: '
_('resource provider generation conflict for provider %(rp)s: '
'actual: %(actual)s, given: %(given)s') %
{'actual': resource_provider.generation,
{'rp': rp_uuid,
'actual': resource_provider.generation,
'given': generation},
comment=errors.CONCURRENT_UPDATE)