openstack
/
ironic
Code Issues Proposed changes

Merge "Remove translation of log messages from ironic/dhcp and ironic/cmd"

This commit is contained in:
Jenkins 2017-04-06 22:36:56 +00:00 committed by Gerrit Code Review
parent 961bde6a24 a232586757
commit cae7d487d6
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/cmd/conductor.py
View File

@ -25,7 +25,6 @@ from oslo_config import cfg
from oslo_log import log from oslo_log import log
from oslo_service import service from oslo_service import service
from ironic.common.i18n import _LW
from ironic.common import rpc_service from ironic.common import rpc_service
from ironic.common import service as ironic_service from ironic.common import service as ironic_service
from ironic.conf import auth from ironic.conf import auth
@ -46,13 +45,13 @@ def _check_auth_options(conf):
missing.append('[%s]' % section) missing.append('[%s]' % section)
if missing: if missing:
link = "http://docs.openstack.org/releasenotes/ironic/newton.html" link = "http://docs.openstack.org/releasenotes/ironic/newton.html"
LOG.warning(_LW("Failed to load authentification credentials from " LOG.warning("Failed to load authentification credentials from "
"%(missing)s config sections. " "%(missing)s config sections. "
"The corresponding service users' credentials " "The corresponding service users' credentials "
"will be loaded from [%(old)s] config section, " "will be loaded from [%(old)s] config section, "
"which is deprecated for this purpose. " "which is deprecated for this purpose. "
"Please update the config file. " "Please update the config file. "
"For more info see %(link)s."), "For more info see %(link)s.",
dict(missing=", ".join(missing), dict(missing=", ".join(missing),
old=auth.LEGACY_SECTION, old=auth.LEGACY_SECTION,
link=link)) link=link))

26
ironic/dhcp/neutron.py
View File

@ -21,7 +21,7 @@ from oslo_log import log as logging
from oslo_utils import netutils from oslo_utils import netutils
from ironic.common import exception from ironic.common import exception
from ironic.common.i18n import _, _LE, _LW from ironic.common.i18n import _
from ironic.common import network from ironic.common import network
from ironic.common import neutron from ironic.common import neutron
from ironic.conf import CONF from ironic.conf import CONF
@ -63,7 +63,7 @@ class NeutronDHCPApi(base.BaseDHCP):
try: try:
neutron.get_client(token).update_port(port_id, port_req_body) neutron.get_client(token).update_port(port_id, port_req_body)
except neutron_client_exc.NeutronClientException: except neutron_client_exc.NeutronClientException:
LOG.exception(_LE("Failed to update Neutron port %s."), port_id) LOG.exception("Failed to update Neutron port %s.", port_id)
raise exception.FailedToUpdateDHCPOptOnPort(port_id=port_id) raise exception.FailedToUpdateDHCPOptOnPort(port_id=port_id)
# TODO(vsaienko) Remove this method when deprecation period is passed # TODO(vsaienko) Remove this method when deprecation period is passed
@ -78,9 +78,9 @@ class NeutronDHCPApi(base.BaseDHCP):
""" """
global update_port_address_deprecation global update_port_address_deprecation
if not update_port_address_deprecation: if not update_port_address_deprecation:
LOG.warning(_LW('update_port_address via DHCP provider is ' LOG.warning('update_port_address via DHCP provider is '
'deprecated. The node.network_interface ' 'deprecated. The node.network_interface '
'port_changed() should be used instead.')) 'port_changed() should be used instead.')
update_port_address_deprecation = True update_port_address_deprecation = True
neutron.update_port_address(port_id, address, token) neutron.update_port_address(port_id, address, token)
@ -134,9 +134,9 @@ class NeutronDHCPApi(base.BaseDHCP):
"Failed to set DHCP BOOT options for any port on node %s.") "Failed to set DHCP BOOT options for any port on node %s.")
% task.node.uuid) % task.node.uuid)
else: else:
LOG.warning(_LW("Some errors were encountered when updating " LOG.warning("Some errors were encountered when updating "
"the DHCP BOOT options for node %(node)s on " "the DHCP BOOT options for node %(node)s on "
"the following Neutron ports: %(ports)s."), "the following Neutron ports: %(ports)s.",
{'node': task.node.uuid, 'ports': failures}) {'node': task.node.uuid, 'ports': failures})
# TODO(adam_g): Hack to workaround bug 1334447 until we have a # TODO(adam_g): Hack to workaround bug 1334447 until we have a
@ -162,7 +162,7 @@ class NeutronDHCPApi(base.BaseDHCP):
try: try:
neutron_port = client.show_port(port_uuid).get('port') neutron_port = client.show_port(port_uuid).get('port')
except neutron_client_exc.NeutronClientException: except neutron_client_exc.NeutronClientException:
LOG.exception(_LE("Failed to Get IP address on Neutron port %s."), LOG.exception("Failed to Get IP address on Neutron port %s.",
port_uuid) port_uuid)
raise exception.FailedToGetIPAddressOnPort(port_id=port_uuid) raise exception.FailedToGetIPAddressOnPort(port_id=port_uuid)
@ -178,11 +178,11 @@ class NeutronDHCPApi(base.BaseDHCP):
if netutils.is_valid_ipv4(ip_address): if netutils.is_valid_ipv4(ip_address):
return ip_address return ip_address
else: else:
LOG.error(_LE("Neutron returned invalid IPv4 address %s."), LOG.error("Neutron returned invalid IPv4 address %s.",
ip_address) ip_address)
raise exception.InvalidIPv4Address(ip_address=ip_address) raise exception.InvalidIPv4Address(ip_address=ip_address)
else: else:
LOG.error(_LE("No IP address assigned to Neutron port %s."), LOG.error("No IP address assigned to Neutron port %s.",
port_uuid) port_uuid)
raise exception.FailedToGetIPAddressOnPort(port_id=port_uuid) raise exception.FailedToGetIPAddressOnPort(port_id=port_uuid)
@ -203,8 +203,8 @@ class NeutronDHCPApi(base.BaseDHCP):
obj_name = 'portgroup' obj_name = 'portgroup'
if isinstance(p_obj, objects.Port): if isinstance(p_obj, objects.Port):
obj_name = 'port' obj_name = 'port'
LOG.warning(_LW("No VIFs found for node %(node)s when attempting " LOG.warning("No VIFs found for node %(node)s when attempting "
"to get IP address for %(obj_name)s: %(obj_id)."), "to get IP address for %(obj_name)s: %(obj_id).",
{'node': task.node.uuid, 'obj_name': obj_name, {'node': task.node.uuid, 'obj_name': obj_name,
'obj_id': p_obj.uuid}) 'obj_id': p_obj.uuid})
raise exception.FailedToGetIPAddressOnPort(port_id=p_obj.uuid) raise exception.FailedToGetIPAddressOnPort(port_id=p_obj.uuid)
@ -237,10 +237,10 @@ class NeutronDHCPApi(base.BaseDHCP):
if isinstance(pobj_list[0], objects.Port): if isinstance(pobj_list[0], objects.Port):
obj_name = 'ports' obj_name = 'ports'
LOG.warning(_LW( LOG.warning(
"Some errors were encountered on node %(node)s " "Some errors were encountered on node %(node)s "
"while retrieving IP addresses on the following " "while retrieving IP addresses on the following "
"%(obj_name)s: %(failures)s."), "%(obj_name)s: %(failures)s.",
{'node': task.node.uuid, 'obj_name': obj_name, {'node': task.node.uuid, 'obj_name': obj_name,
'failures': failures}) 'failures': failures})