Merge "Fix health status polling interval"

Author: Zuul

magnum/service/periodic.py

@@ -152,9 +152,7 @@ def __init__(self, conf):
         super(MagnumPeriodicTasks, self).__init__(conf)
         self.notifier = rpc.get_notifier()
 
-    @periodic_task.periodic_task(
-        spacing=CONF.kubernetes.health_polling_interval,
-        run_immediately=True)
+    @periodic_task.periodic_task(spacing=10, run_immediately=True)
     @set_context
     def sync_cluster_status(self, ctx):
         try:
@@ -184,7 +182,9 @@ def sync_cluster_status(self, ctx):
                 "Ignore error [%s] when syncing up cluster status.",
                 e, exc_info=True)
 
-    @periodic_task.periodic_task(spacing=10, run_immediately=True)
+    @periodic_task.periodic_task(
+        spacing=CONF.kubernetes.health_polling_interval,
+        run_immediately=True)
     @set_context
     def sync_cluster_health_status(self, ctx):
         try: