From 83a0d5616e946612aba9dd06b1c683deccd0ba8d Mon Sep 17 00:00:00 2001 From: Erik Olof Gunnar Andersson Date: Wed, 9 May 2018 18:39:51 -0700 Subject: [PATCH] Remove remaning log translation in scheduler * Removed log translation. * Fixed minor misaligned log lines. Change-Id: I04fb2726d5218d9f7762e843cfcd64d70c55adcb --- .../filters/aggregate_image_properties_isolation.py | 5 ++--- nova/scheduler/filters/aggregate_instance_extra_specs.py | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nova/scheduler/filters/aggregate_image_properties_isolation.py b/nova/scheduler/filters/aggregate_image_properties_isolation.py index 3649d1d1a..95f22365f 100644 --- a/nova/scheduler/filters/aggregate_image_properties_isolation.py +++ b/nova/scheduler/filters/aggregate_image_properties_isolation.py @@ -17,7 +17,6 @@ from oslo_log import log as logging import nova.conf -from nova.i18n import _LW from nova.scheduler import filters from nova.scheduler.filters import utils @@ -54,8 +53,8 @@ class AggregateImagePropertiesIsolation(filters.BaseHostFilter): try: prop = image_props.get(key) except AttributeError: - LOG.warning(_LW("Host '%(host)s' has a metadata key '%(key)s' " - "that is not present in the image metadata."), + LOG.warning("Host '%(host)s' has a metadata key '%(key)s' " + "that is not present in the image metadata.", {"host": host_state.host, "key": key}) continue diff --git a/nova/scheduler/filters/aggregate_instance_extra_specs.py b/nova/scheduler/filters/aggregate_instance_extra_specs.py index d2e2d1520..45373b02d 100644 --- a/nova/scheduler/filters/aggregate_instance_extra_specs.py +++ b/nova/scheduler/filters/aggregate_instance_extra_specs.py @@ -61,7 +61,8 @@ class AggregateInstanceExtraSpecsFilter(filters.BaseHostFilter): key = scope[0] aggregate_vals = metadata.get(key, None) if not aggregate_vals: - LOG.debug("%(host_state)s fails instance_type extra_specs " + LOG.debug( + "%(host_state)s fails instance_type extra_specs " "requirements. Extra_spec %(key)s is not in aggregate.", {'host_state': host_state, 'key': key}) return False @@ -70,8 +71,8 @@ class AggregateInstanceExtraSpecsFilter(filters.BaseHostFilter): break else: LOG.debug("%(host_state)s fails instance_type extra_specs " - "requirements. '%(aggregate_vals)s' do not " - "match '%(req)s'", + "requirements. '%(aggregate_vals)s' do not " + "match '%(req)s'", {'host_state': host_state, 'req': req, 'aggregate_vals': aggregate_vals}) return False