openstack/ironic
Code Issues Proposed changes

Merge "Remove log translation function calls from ironic.db"

Browse Source
This commit is contained in:
Jenkins 2017-03-23 23:46:27 +00:00 committed by Gerrit Code Review
commit d10b102ba7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ironic/db/sqlalchemy/api.py
View File

@ -34,7 +34,7 @@ from sqlalchemy.orm import joinedload
from sqlalchemy import sql from sqlalchemy import sql
from ironic.common import exception from ironic.common import exception
from ironic.common.i18n import _, _LW from ironic.common.i18n import _
from ironic.common import states from ironic.common import states
from ironic.conf import CONF from ironic.conf import CONF
from ironic.db import api from ironic.db import api
@ -783,8 +783,8 @@ class Connection(api.Connection):
if nodes: if nodes:
nodes = ', '.join(nodes) nodes = ', '.join(nodes)
LOG.warning( LOG.warning(
_LW('Cleared reservations held by %(hostname)s: ' 'Cleared reservations held by %(hostname)s: '
'%(nodes)s'), {'hostname': hostname, 'nodes': nodes}) '%(nodes)s', {'hostname': hostname, 'nodes': nodes})
@oslo_db_api.retry_on_deadlock @oslo_db_api.retry_on_deadlock
def clear_node_target_power_state(self, hostname): def clear_node_target_power_state(self, hostname):
@ -802,9 +802,9 @@ class Connection(api.Connection):
if nodes: if nodes:
nodes = ', '.join(nodes) nodes = ', '.join(nodes)
LOG.warning( LOG.warning(
_LW('Cleared target_power_state of the locked nodes in ' 'Cleared target_power_state of the locked nodes in '
'powering process, their power state can be incorrect: ' 'powering process, their power state can be incorrect: '
'%(nodes)s'), {'nodes': nodes}) '%(nodes)s', {'nodes': nodes})
def get_active_driver_dict(self, interval=None): def get_active_driver_dict(self, interval=None):
query = model_query(models.Conductor) query = model_query(models.Conductor)