Merge "Make resource_tracker record host_ip"

nova/compute/resource_tracker.py

@@ -52,6 +52,8 @@ CONF.register_opts(resource_tracker_opts)
 LOG = logging.getLogger(__name__)
 COMPUTE_RESOURCE_SEMAPHORE = "compute_resources"
 
+CONF.import_opt('my_ip', 'nova.netconf')
+
 
 class ResourceTracker(object):
     """Compute helper class for keeping track of resource usage as instances
@@ -271,6 +273,7 @@ class ResourceTracker(object):
                  "'get_available_resource'  Compute tracking is disabled."))
             self.compute_node = None
             return
+        resources['host_ip'] = CONF.my_ip
 
         self._verify_resources(resources)
 

nova/tests/compute/test_resource_tracker.py

@@ -519,6 +519,9 @@ class InstanceClaimTestCase(BaseTrackerTestCase):
 
         self.tracker.update_available_resource(self.context)
 
+        # confirm tracker is adding in host_ip
+        self.assertTrue(self.compute.get('host_ip') is not None)
+
         # confirm that resource usage is derived from instance usages,
         # not virt layer:
         self.assertEqual(claim_mem + FAKE_VIRT_MEMORY_OVERHEAD,