diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py
index fe375202b760..e5a57101d809 100644
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@@ -528,9 +528,9 @@ class ResourceTracker(object):
         self._copy_resources(cn, resources)
         self.compute_nodes[nodename] = cn
         cn.create()
-        LOG.info('Compute_service record created for '
-                 '%(host)s:%(node)s',
-                 {'host': self.host, 'node': nodename})
+        LOG.info('Compute node record created for '
+                 '%(host)s:%(node)s with uuid: %(uuid)s',
+                 {'host': self.host, 'node': nodename, 'uuid': cn.uuid})
 
         self._setup_pci_tracker(context, cn, resources)
         self._update(context, cn)
diff --git a/nova/tests/unit/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py
index 14cf0a6aa965..5e6cfb14ce3d 100644
--- a/nova/tests/unit/compute/test_resource_tracker.py
+++ b/nova/tests/unit/compute/test_resource_tracker.py
@@ -1067,7 +1067,8 @@ class TestInitComputeNode(BaseTestCase):
             cpu_allocation_ratio=1.0,
             disk_allocation_ratio=1.0,
             stats={},
-            pci_device_pools=objects.PciDevicePoolList(objects=[])
+            pci_device_pools=objects.PciDevicePoolList(objects=[]),
+            uuid=uuids.compute_node_uuid
         )
 
         def set_cn_id():
@@ -1076,6 +1077,7 @@ class TestInitComputeNode(BaseTestCase):
             # 'id' in base class error
             cn = self.rt.compute_nodes[_NODENAME]
             cn.id = 42  # Has to be a number, not a mock
+            cn.uuid = uuids.compute_node_uuid
 
         create_mock.side_effect = set_cn_id
         self.rt._init_compute_node(mock.sentinel.ctx, resources)