diff --git a/cinder/manager.py b/cinder/manager.py index f9582979bee..ba38476dfca 100644 --- a/cinder/manager.py +++ b/cinder/manager.py @@ -98,10 +98,6 @@ class Manager(base.Base, PeriodicTasks): def service_topic_queue(self): return self.cluster or self.host - def periodic_tasks(self, context, raise_on_error=False): - """Tasks to be run at a periodic interval.""" - return self.run_periodic_tasks(context, raise_on_error=raise_on_error) - def init_host(self, service_id=None, added_to_cluster=None): """Handle initialization if this is a standalone service. diff --git a/cinder/service.py b/cinder/service.py index b7e3af45185..1bd9b31ad73 100644 --- a/cinder/service.py +++ b/cinder/service.py @@ -471,7 +471,7 @@ class Service(service.Service): def periodic_tasks(self, raise_on_error=False): """Tasks to be run at a periodic interval.""" ctxt = context.get_admin_context() - self.manager.periodic_tasks(ctxt, raise_on_error=raise_on_error) + self.manager.run_periodic_tasks(ctxt, raise_on_error=raise_on_error) def report_state(self): """Update the state of this service in the datastore."""