Admin API + Worker Tracking.

2 files changed, 6 insertions, 4 deletions

diff --git a/bin/nova-api b/bin/nova-api
index e9772ec81..f0f79a236 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -20,7 +20,7 @@
 #    under the License.
 
 """
-  Tornado daemon for the main API endpoint.  
+Tornado daemon for the main API endpoint.  
 """
 
 import logging
@@ -34,6 +34,7 @@ from nova import rpc
 from nova import server
 from nova import utils
 from nova.auth import users
+from nova.compute import model
 from nova.endpoint import admin
 from nova.endpoint import api
 from nova.endpoint import cloud
@@ -43,9 +44,10 @@ FLAGS = flags.FLAGS
 
 def main(_argv):
     user_manager = users.UserManager()
+    host_manager = model.Host
     controllers = {
         'Cloud': cloud.CloudController(),
-        'Admin': admin.AdminController(user_manager)
+        'Admin': admin.AdminController(user_manager, host_manager)
     }
     _app = api.APIServerApplication(user_manager, controllers)
 
diff --git a/bin/nova-compute b/bin/nova-compute
index cc738e87f..ed829ecc8 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -75,8 +75,8 @@ def main():
             topic='%s.%s' % (FLAGS.compute_topic, FLAGS.node_name),
             proxy=n)
 
-    # heartbeat = task.LoopingCall(n.report_state)
-    # heartbeat.start(interval=FLAGS.node_report_state_interval, now=False)
+    pulse = task.LoopingCall(n.report_state, FLAGS.node_name, 'nova-compute')
+    pulse.start(interval=FLAGS.node_report_state_interval, now=False)
 
     injected = consumer_all.attach_to_twisted()
     injected = consumer_node.attach_to_twisted()