diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-03 23:34:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-03 23:34:18 +0000 |
| commit | 4c951f6ab477697da2bf8b55f32b1c0965e73576 (patch) | |
| tree | 99d71e1d004b3f23487c1856672252eca1fa4a7b | |
| parent | c6617b66ab09e2728f9f8934733786970869e454 (diff) | |
| parent | ddf0d607c0b0063e1b04aa8e79a81e5811759495 (diff) | |
| download | ironic-4c951f6ab477697da2bf8b55f32b1c0965e73576.tar.gz | |
Merge "Fix mis-formatted log messages" into stable/ocata
| -rw-r--r-- | ironic/dhcp/neutron.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/conductor/test_task_manager.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index a335cea7b..f86081833 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -204,7 +204,7 @@ class NeutronDHCPApi(base.BaseDHCP): if isinstance(p_obj, objects.Port): obj_name = 'port' LOG.warning(_LW("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)s."), {'node': task.node.uuid, 'obj_name': obj_name, 'obj_id': p_obj.uuid}) raise exception.FailedToGetIPAddressOnPort(port_id=p_obj.uuid) diff --git a/ironic/tests/unit/conductor/test_task_manager.py b/ironic/tests/unit/conductor/test_task_manager.py index fff06e191..2e2b39e73 100644 --- a/ironic/tests/unit/conductor/test_task_manager.py +++ b/ironic/tests/unit/conductor/test_task_manager.py @@ -729,6 +729,7 @@ class TaskManagerStateModelTestCases(tests_base.TestCase): t.shared = True t._purpose = 'purpose' t._debug_timer = mock.Mock() + t._debug_timer.elapsed.return_value = 3.14 t.release_resources(t) self.assertIsNone(t.node) |