From 12e888d4424de3c2ce9f29f521d99c45f4304cc3 Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Tue, 13 Aug 2013 17:00:43 -0700
Subject: [PATCH] Disable compute fanout to scheduler

Now that nothing is using publish_service_capabilities it can be
disabled, but not removed in order to not break compute rpcapi backwards
compatibility.

Part of bp no-compute-fanout-to-scheduler.

Change-Id: I80c49c46138fd6ee89cb08ffbbced72ada4de72e
---
 nova/manager.py           |  3 ++-
 nova/scheduler/manager.py | 11 +++--------
 nova/scheduler/rpcapi.py  |  3 +++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nova/manager.py b/nova/manager.py
index 5a23c4272..a270b927b 100644
--- a/nova/manager.py
+++ b/nova/manager.py
@@ -152,13 +152,14 @@ class SchedulerDependentManager(Manager):
             capabilities = [capabilities]
         self.last_capabilities = capabilities
 
-    @periodic_task.periodic_task
     def publish_service_capabilities(self, context):
         """Pass data back to the scheduler.
 
         Called at a periodic interval. And also called via rpc soon after
         the start of the scheduler.
         """
+        #NOTE(jogo): this is now deprecated, unused and can be removed in
+        #V3.0 of compute  RPCAPI
         if self.last_capabilities:
             LOG.debug(_('Notifying Schedulers of capabilities ...'))
             self.scheduler_rpcapi.update_service_capabilities(context,
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index 3fd31ee09..06e308baf 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -29,7 +29,6 @@ from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova.conductor import api as conductor_api
 from nova.conductor.tasks import live_migrate
-import nova.context
 from nova import exception
 from nova import manager
 from nova.objects import instance as instance_obj
@@ -68,16 +67,12 @@ class SchedulerManager(manager.Manager):
         super(SchedulerManager, self).__init__(service_name='scheduler',
                                                *args, **kwargs)
 
-    def post_start_hook(self):
-        """After we start up and can receive messages via RPC, tell all
-        compute nodes to send us their capabilities.
-        """
-        ctxt = nova.context.get_admin_context()
-        compute_rpcapi.ComputeAPI().publish_service_capabilities(ctxt)
-
     def update_service_capabilities(self, context, service_name,
                                     host, capabilities):
         """Process a capability update from a service node."""
+        #NOTE(jogo) This is deprecated, but is used by the deprecated
+        # publish_service_capabilities call. So this can begin its removal
+        # process once publish_service_capabilities is removed.
         if not isinstance(capabilities, list):
             capabilities = [capabilities]
         for capability in capabilities:
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py
index 47c889aaf..11f8984c0 100644
--- a/nova/scheduler/rpcapi.py
+++ b/nova/scheduler/rpcapi.py
@@ -125,6 +125,9 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
 
     def update_service_capabilities(self, ctxt, service_name, host,
             capabilities):
+        #NOTE(jogo) This is deprecated, but is used by the deprecated
+        # publish_service_capabilities call. So this can begin its removal
+        # process once publish_service_capabilities is removed.
         self.fanout_cast(ctxt, self.make_msg('update_service_capabilities',
                 service_name=service_name, host=host,
                 capabilities=capabilities),