summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-20 00:55:09 +0000
committerGerrit Code Review <review@openstack.org>2012-11-20 00:55:09 +0000
commitf5119ca582e5fd5f42ab32a765352314aa5ae28b (patch)
tree4502dedacd8573ee8ebf8d7286b1f405ea8cfcf6 /nova/compute
parent534af0d2002ff80dfb9c66254b2289350b79718c (diff)
parent3349417edfd86d995b144588059aa1c8d8e25a9d (diff)
Merge "Pass rpc connection to pre_start_hook."
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 18cc91e12..22f96bbee 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -407,7 +407,7 @@ class ComputeManager(manager.SchedulerDependentManager):
self._report_driver_status(context)
self.publish_service_capabilities(context)
- def pre_start_hook(self):
+ def pre_start_hook(self, **kwargs):
"""After the service is initialized, but before we fully bring
the service up by listening on RPC queues, make sure to update
our available resources.