Merge pull request #3518 from jbradberry/isolated-heartbeat

Make use of user-defined settings for defining the isolated nodes heartbeat

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/settings/defaults.py

@@ -496,11 +496,7 @@ CELERYBEAT_SCHEDULE = {
         'schedule': timedelta(seconds=20),
         'options': {'expires': 20}
     },
-    'isolated_heartbeat': {
+    # 'isolated_heartbeat': set up at the end of production.py and development.py
-        'task': 'awx.main.tasks.awx_isolated_heartbeat',
-        'schedule': timedelta(seconds=AWX_ISOLATED_PERIODIC_CHECK),
-        'options': {'expires': AWX_ISOLATED_PERIODIC_CHECK * 2},
-    }
 }
 AWX_INCONSISTENT_TASK_INTERVAL = 60 * 3
 

awx/settings/development.py

@@ -143,6 +143,15 @@ except ImportError:
     traceback.print_exc()
     sys.exit(1)
 
+
+CELERYBEAT_SCHEDULE.update({  # noqa
+    'isolated_heartbeat': {
+        'task': 'awx.main.tasks.awx_isolated_heartbeat',
+        'schedule': timedelta(seconds=AWX_ISOLATED_PERIODIC_CHECK),  # noqa
+        'options': {'expires': AWX_ISOLATED_PERIODIC_CHECK * 2},  # noqa
+    }
+})
+
 CLUSTER_HOST_ID = socket.gethostname()
 
 try:

awx/settings/production.py

@@ -107,3 +107,12 @@ except IOError:
             raise ImproperlyConfigured(msg)
     else:
         raise
+
+
+CELERYBEAT_SCHEDULE.update({  # noqa
+    'isolated_heartbeat': {
+        'task': 'awx.main.tasks.awx_isolated_heartbeat',
+        'schedule': timedelta(seconds=AWX_ISOLATED_PERIODIC_CHECK),  # noqa
+        'options': {'expires': AWX_ISOLATED_PERIODIC_CHECK * 2},  # noqa
+    }
+})