diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 9e3208028..d4b77ad70 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2953,7 +2953,7 @@ def quota_reserve(context, resources, quotas, deltas, expire, if unders: LOG.warning(_("Change will make usage less than 0 for the following " - "resources: %(unders)s") % locals()) + "resources: %s"), unders) if overs: usages = dict((k, dict(in_use=v['in_use'], reserved=v['reserved'])) for k, v in usages.items()) diff --git a/nova/utils.py b/nova/utils.py index 1a2db757f..6fa418575 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -398,7 +398,7 @@ def get_my_linklocal(interface): raise exception.NovaException(msg) except Exception as ex: msg = _("Couldn't get Link Local IP of %(interface)s" - " :%(ex)s") % locals() + " :%(ex)s") % {'interface': interface, 'ex': ex} raise exception.NovaException(msg) @@ -1105,12 +1105,12 @@ def check_string_length(value, name, min_length=0, max_length=None): if len(value) < min_length: msg = _("%(name)s has less than %(min_length)s " - "characters.") % locals() + "characters.") % {'name': name, 'min_length': min_length} raise exception.InvalidInput(message=msg) if max_length and len(value) > max_length: msg = _("%(name)s has more than %(max_length)s " - "characters.") % locals() + "characters.") % {'name': name, 'max_length': max_length} raise exception.InvalidInput(message=msg)